mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-23 16:20:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r26575] Removed compiler warning for hl/tools and hl/src.

Browse Source 
HDF5-250 and HDF5-241

tested: h5committest
This commit is contained in:
Scot Breitenfeld 2015-03-25 10:25:59 -05:00
parent 460b629e03
commit 299deb64fb
6 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
hl/src/H5DS.c
View File

@ -1430,10 +1430,12 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
hid_t aid = -1; /* attribute ID */
int rank; /* rank of dataset */
hsize_t dims[1]; /* dimensions of dataset */
const char **buf = NULL; /* buffer to store in the attribute */
H5I_type_t it; /* ID type */
unsigned int i;
union { /* union is needed to eliminate compiler warnings about */
char ** buf; /* discarding the 'const' qualifier in the free */
char const ** const_buf; /* buf calls */
} u;
/*-------------------------------------------------------------------------
* parameter checking
*-------------------------------------------------------------------------
@ -1496,19 +1498,19 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
goto out;
/* allocate and initialize */
buf = (const char **) HDmalloc((size_t) rank * sizeof(char *));
u.const_buf = (char const **) HDmalloc((size_t) rank * sizeof(char *));
if (buf == NULL)
if (u.const_buf == NULL)
goto out;
for (i = 0; i < (unsigned int) rank; i++)
buf[i] = NULL;
u.const_buf[i] = NULL;
/* store the label information in the required index */
buf[idx] = label;
u.const_buf[idx] = label;
/* write the attribute with the label */
if (H5Awrite(aid, tid, buf) < 0)
if (H5Awrite(aid, tid, u.const_buf) < 0)
goto out;
/* close */
@ -1518,10 +1520,10 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
goto out;
if (H5Aclose(aid) < 0)
goto out;
if (buf)
if (u.const_buf)
{
HDfree(buf);
buf = NULL;
HDfree(u.const_buf);
u.const_buf = NULL;
}
}
@ -1532,6 +1534,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
else
{
if ((aid = H5Aopen(did, DIMENSION_LABELS, H5P_DEFAULT)) < 0)
goto out;
@ -1539,34 +1542,34 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
goto out;
/* allocate and initialize */
buf = (const char **) HDmalloc((size_t) rank * sizeof(char *));
if (buf == NULL)
u.buf = (char **) HDmalloc((size_t) rank * sizeof(char *));
if (u.buf == NULL)
goto out;
/* read */
if (H5Aread(aid, tid, (void *) buf) < 0)
if (H5Aread(aid, tid, (void *)u.buf) < 0)
goto out;
/* free the ptr that will be replaced by label */
if (buf[idx])
HDfree(buf[idx]);
if (u.buf[idx])
HDfree(u.buf[idx]);
/* store the label information in the required index */
buf[idx] = label;
u.const_buf[idx] = label;
/* write the attribute with the new references */
if (H5Awrite(aid, tid, buf) < 0)
if (H5Awrite(aid, tid, u.buf) < 0)
goto out;
/* label was brought in, so don't free */
buf[idx] = NULL;
u.buf[idx] = NULL;
/* free all the ptr's from the H5Aread() */
for (i = 0; i < (unsigned int) rank; i++)
{
if (buf[i])
HDfree(buf[i]);
if (u.buf[i])
HDfree(u.buf[i]);
}
/* close */
@ -1574,28 +1577,29 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
goto out;
if (H5Aclose(aid) < 0)
goto out;
if (buf)
if (u.buf)
{
HDfree(buf);
buf = NULL;
HDfree(u.buf);
u.buf = NULL;
}
}
return SUCCEED;
/* error zone */
out:
if (buf)
if (u.buf)
{
if (buf[idx]) /* check if we errored during H5Awrite */
buf[idx] = NULL; /* don't free label */
if (u.buf[idx]) /* check if we errored during H5Awrite */
u.buf[idx] = NULL; /* don't free label */
/* free all the ptr's from the H5Aread() */
for (i = 0; i < (unsigned int) rank; i++)
{
if (buf[i])
HDfree(buf[i]);
if (u.buf[i])
HDfree(u.buf[i]);
}
HDfree(buf);
HDfree(u.buf);
}
H5E_BEGIN_TRY
{

2
hl/tools/gif2h5/decompress.c
View File

@ -90,7 +90,7 @@ ReadCode(void)
RawCode += (0x10000 * Raster[ByteOffset + 2]);
RawCode >>= (BitOffset % 8);
BitOffset += CodeSize;
BitOffset += (int)CodeSize;
return (RawCode & ReadMask);
}

10
hl/tools/gif2h5/gif2mem.c
View File

@ -153,7 +153,7 @@ Gif2Mem(BYTE *MemGif, GIFTOMEM *GifMemoryStruct)
if (ImageCount > ImageArray) {
aTemp = ImageArray;
ImageArray = (ImageArray << 1) + 1;
ImageArray = (BYTE)((ImageArray << 1) + 1);
if (!(gifImageDesc = (GIFIMAGEDESC **)realloc(gifImageDesc,
sizeof(GIFIMAGEDESC *) * ImageArray))) {
printf("Out of memory!");
@ -220,7 +220,7 @@ Gif2Mem(BYTE *MemGif, GIFTOMEM *GifMemoryStruct)
PlainTextCount++;
if (PlainTextCount > PlainTextArray)
PlainTextArray = (PlainTextArray << 1) + 1;
PlainTextArray = (BYTE)((PlainTextArray << 1) + 1);
if (!(gifPlainText = (GIFPLAINTEXT **)realloc(gifPlainText , sizeof(GIFPLAINTEXT *) * PlainTextArray))) {
printf("Out of memory!");
@ -242,7 +242,7 @@ Gif2Mem(BYTE *MemGif, GIFTOMEM *GifMemoryStruct)
CommentCount++;
if (CommentCount > CommentArray)
CommentArray = (CommentArray << 1) + 1;
CommentArray = (BYTE)((CommentArray << 1) + 1);
if (!(gifComment = (GIFCOMMENT **)realloc(gifComment , sizeof(GIFCOMMENT *) * CommentArray))) {
printf("Out of memory!");
@ -269,7 +269,7 @@ Gif2Mem(BYTE *MemGif, GIFTOMEM *GifMemoryStruct)
if (ImageCount > ImageArray) {
aTemp = ImageArray;
ImageArray = (ImageArray << 1) + 1;
ImageArray = (BYTE)((ImageArray << 1) + 1);
if (!(gifGraphicControl = (GIFGRAPHICCONTROL **)realloc(gifGraphicControl , sizeof(GIFGRAPHICCONTROL *) * ImageArray))) {
printf("Out of memory!");
@ -307,7 +307,7 @@ Gif2Mem(BYTE *MemGif, GIFTOMEM *GifMemoryStruct)
ApplicationCount++;
if (ApplicationCount > ApplicationArray)
ApplicationArray = (ApplicationArray << 1) + 1;
ApplicationArray = (BYTE)((ApplicationArray << 1) + 1);
if (!(gifApplication = (GIFAPPLICATION **)realloc(gifApplication , sizeof(GIFAPPLICATION *) * ApplicationArray))) {
printf("Out of memory!");

8
hl/tools/gif2h5/h52gifgentst.c
View File

@ -64,7 +64,7 @@ int main(void)
space = WIDTH*HEIGHT / PAL_ENTRIES;
for (i=0, j=0, n=0; i < WIDTH*HEIGHT; i++, j++ )
{
buf[i] = n;
buf[i] = (unsigned char)n;
if ( j > space )
{
n++;
@ -83,9 +83,9 @@ int main(void)
*/
for ( i=0, n=0; i<PAL_ENTRIES*3; i+=3, n++)
{
pal[i] =n; /* red */
pal[i+1]=0; /* green */
pal[i+2]=255-n; /* blue */
pal[i] = (unsigned char)n; /* red */
pal[i+1] = (unsigned char)0; /* green */
pal[i+2] = (unsigned char)(255-n); /* blue */
}
/* make a palette */

8
hl/tools/gif2h5/hdf2gif.c
View File

@ -194,9 +194,9 @@ int main(int argc , char **argv)
numcols = 256;
for (i = 0 ; i < numcols ; i++)
{
Red[i] = 255 - i;
Green[i] = 255 - i;
Blue[i] = 255 - i;
Red[i] = (BYTE)(255 - i);
Green[i] = (BYTE)(255 - i);
Blue[i] = (BYTE)(255 - i);
}
}
else
@ -229,7 +229,7 @@ int main(int argc , char **argv)
if (j==i)
{
/* wasn't found */
pc2nc[i] = nc;
pc2nc[i] = (BYTE)nc;
r1[nc] = Red[i];
g1[nc] = Green[i];
b1[nc] = Blue[i];

8
hl/tools/gif2h5/hdfgifwr.c
View File

@ -270,7 +270,7 @@ nomatch:
ent = c;
if (free_ent < maxmaxcode) {
CodeTabOf (i) = free_ent++; /* code -> hashtable */
CodeTabOf (i) = (unsigned short)free_ent++; /* code -> hashtable */
HashTabOf (i) = fcode;
} else {
cl_block();
@ -313,9 +313,9 @@ output(int code)
cur_accum &= masks[cur_bits];
if (cur_bits > 0)
cur_accum |= ((long)code << cur_bits);
cur_accum |= (unsigned long)((long)code << cur_bits);
else
cur_accum = code;
cur_accum = (unsigned long)code;
cur_bits += n_bits;
@ -437,7 +437,7 @@ static char accum[ 256 ];
static void
char_out(int c)
{
accum[ a_count++ ] = c;
accum[ a_count++ ] = (char)c;
if (a_count >= 254)
flush_char();