summaryrefslogtreecommitdiffstats
path: root/tools/gifconv/gifread.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-09-25 17:46:32 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-09-25 17:46:32 (GMT)
commited663577a5394d34a0cfbe5cd5443af1f7957dc5 (patch)
treef334d37a08de1f77ce046907bce49c9ff56c6597 /tools/gifconv/gifread.c
parenta6036953db9be2210acbed0882cf62c594b3a168 (diff)
downloadhdf5-ed663577a5394d34a0cfbe5cd5443af1f7957dc5.zip
hdf5-ed663577a5394d34a0cfbe5cd5443af1f7957dc5.tar.gz
hdf5-ed663577a5394d34a0cfbe5cd5443af1f7957dc5.tar.bz2
[svn-r4473] Purpose:
Code cleanup for better compatibility with C++ compilers Description: C++ compilers are choking on our C code, for various reasons: we used our UNUSED macro incorrectly when referring to pointer types we used various C++ keywords as variables, etc. we incremented enum's with the ++ operator. Solution: Changed variables, etc.to avoid C++ keywords (new, class, typename, typeid, template) Fixed usage of UNUSED macro from this: char UNUSED *c to this: char * UNUSED c Switched the enums from x++ to x=x+1 Platforms tested: FreeBSD 4.4 (hawkwind)
Diffstat (limited to 'tools/gifconv/gifread.c')
-rw-r--r--tools/gifconv/gifread.c35
1 files changed, 20 insertions, 15 deletions
diff --git a/tools/gifconv/gifread.c b/tools/gifconv/gifread.c
index 39043f3..3e01801 100644
--- a/tools/gifconv/gifread.c
+++ b/tools/gifconv/gifread.c
@@ -112,9 +112,10 @@ ReadGifHeader(GIFHEAD *GifHead, /* Pointer to GIF header structure */
** otherwise 0 if no error occured.
*/
int
-ReadGifImageDesc(GifImageDesc, MemGif2)
-GIFIMAGEDESC *GifImageDesc; /* Pointer to GIF image descriptor structure */
-BYTE **MemGif2; /* GIF image file input FILE stream */
+ReadGifImageDesc(
+ GIFIMAGEDESC *GifImageDesc, /* Pointer to GIF image descriptor structure */
+ BYTE **MemGif2 /* GIF image file input FILE stream */
+ )
{
WORD i; /* Loop counter */
WORD tableSize; /* Number of entries in the Local Color Table */
@@ -208,9 +209,10 @@ BYTE **MemGif2; /* GIF image file input FILE stream */
** otherwise 0 if no error occured.
*/
int
-ReadGifGraphicControl(GifGraphicControl, MemGif2)
-GIFGRAPHICCONTROL *GifGraphicControl; /* Pointer to GC Extension structure */
-BYTE **MemGif2; /* GIF image file input FILE stream */
+ReadGifGraphicControl(
+ GIFGRAPHICCONTROL *GifGraphicControl, /* Pointer to GC Extension structure */
+ BYTE **MemGif2 /* GIF image file input FILE stream */
+ )
{
int i;
@@ -232,9 +234,10 @@ BYTE **MemGif2; /* GIF image file input FILE stream */
** otherwise 0 if no error occured.
*/
int
-ReadGifPlainText(GifPlainText, MemGif2)
-GIFPLAINTEXT *GifPlainText; /* Pointer to Plain Text Extension structure */
-BYTE **MemGif2; /* GIF image file input FILE stream */
+ReadGifPlainText(
+ GIFPLAINTEXT *GifPlainText, /* Pointer to Plain Text Extension structure */
+ BYTE **MemGif2 /* GIF image file input FILE stream */
+ )
{
int i;
@@ -270,9 +273,10 @@ BYTE **MemGif2; /* GIF image file input FILE stream */
** otherwise 0 if no error occured.
*/
int
-ReadGifApplication(GifApplication, MemGif2)
-GIFAPPLICATION *GifApplication; /* Pointer to Application Extension structure */
-BYTE **MemGif2; /* GIF image file input FILE stream */
+ReadGifApplication(
+ GIFAPPLICATION *GifApplication, /* Pointer to Application Extension structure */
+ BYTE **MemGif2 /* GIF image file input FILE stream */
+ )
{
int i;
@@ -307,9 +311,10 @@ BYTE **MemGif2; /* GIF image file input FILE stream
** otherwise 0 if no error occured.
*/
int
-ReadGifComment(GifComment, MemGif2)
-GIFCOMMENT *GifComment; /* Pointer to GIF Comment Extension structure */
-BYTE **MemGif2; /* GIF image file input FILE stream */
+ReadGifComment(
+ GIFCOMMENT *GifComment, /* Pointer to GIF Comment Extension structure */
+ BYTE **MemGif2 /* GIF image file input FILE stream */
+ )
{
/* Read in the Plain Text data sub-blocks */