cvs: php4 /ext/exif exif.c

rasmus Sat Mar 2 03:37:28 2002 EDT Modified files: /php4/ext/exif exif.c Log: Fix a couple of warnings Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.40 php4/ext/exif/exif.c:1.41 --- php4/ext/exif/exif.c:1.40 Thu Feb 28 23:01:25 2002 +++ php4/ext/exif/exif.c Sat Mar 2 03:37:28 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.40 2002/03/01 04:01:25 helly Exp $ */ +/* $Id: exif.c,v 1.41 2002/03/02 08:37:28 rasmus Exp $ */ /* Much of the code in this module was borrowed from the public domain jhead.c package with the author's consent. The main changes have been @@ -178,7 +178,7 @@ }; /* }}} */ -#define EXIF_VERSION "2.0a $Revision: 1.40 $" +#define EXIF_VERSION "2.0a $Revision: 1.41 $" PHP_MINFO_FUNCTION(exif); @@ -634,7 +634,7 @@ char mbBuffer[MB_CUR_MAX]; /* Copy the comment */ - if ( ByteCount>8 && !memcmp(szValuePtr, "UNICODE\0", 8) || !memcmp(szValuePtr, "JIS\0\0\0\0\0", 8)) { + if ( ((ByteCount>8) && !memcmp(szValuePtr, "UNICODE\0", 8)) || !memcmp(szValuePtr, "JIS\0\0\0\0\0", 8)) { /* treat JIS encoding as if it where UNICODE */ szValuePtr = szValuePtr+8; ByteCount -= 8; @@ -736,7 +736,7 @@ static void ProcessExifDir(ImageInfoType *ImageInfo, char *DirStart, char *OffsetBase, unsigned ExifLength, char *LastExifRefd, int ReadThumbnail) { int de; - int a,l; + int l; int NumDirEntries; int NextDirOffset;