wxMessageBox off the main thread lost result code.

[wxWidgets.git] / src / tiff / contrib / iptcutil / iptcutil.c

diff --git a/src/tiff/contrib/iptcutil/iptcutil.c b/src/tiff/contrib/iptcutil/iptcutil.c
index c3297520a6e22bec6b4abff21ce64b1a50a705ea..cd12617028720eab211594c23aec6891bf6836a3 100644 (file)
--- a/src/tiff/contrib/iptcutil/iptcutil.c
+++ b/src/tiff/contrib/iptcutil/iptcutil.c
@@ -1,11 +1,9 @@
-/* $Id$ */
 
 #include "tif_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <memory.h>
 #include <ctype.h>
 
 #ifdef HAVE_STRINGS_H
@@ -294,7 +292,10 @@ int formatIPTC(FILE *ifile, FILE *ofile)
     {
       c = str[tagindx] = getc(ifile);
       if (c == EOF)
-        return -1;
+      {
+          free(str);
+          return -1;
+      }
     }
     str[ taglen ] = 0;
 
@@ -332,12 +333,12 @@ char *super_fgets(char *b, int *blen, FILE *file)
     c=fgetc(file);
     if (c == EOF || c == '\n')
       break;
-    if (((int)q - (int)b + 1 ) >= (int) len)
+    if (((long)q - (long)b + 1 ) >= (long) len)
       {
-        int
+        long
           tlen;
 
-        tlen=(int)q-(int)b;
+        tlen=(long)q-(long)b;
         len<<=1;
         b=(char *) realloc((char *) b,(len+2));
         if ((char *) b == (char *) NULL)
@@ -352,7 +353,7 @@ char *super_fgets(char *b, int *blen, FILE *file)
       int
         tlen;
 
-      tlen=(int)q - (int)b;
+      tlen=(long)q - (long)b;
       if (tlen == 0)
         return (char *) NULL;
       b[tlen] = '\0';
@@ -385,7 +386,7 @@ int main(int argc, char *argv[])
 
   if( argc < 2 )
     {
-      printf(usage);
+      puts(usage);
            return 1;
     }
 
@@ -444,7 +445,7 @@ int main(int argc, char *argv[])
       }
     else
       {
-        printf(usage);
+        puts(usage);
              return 1;
       }
   }
@@ -932,3 +933,10 @@ byebye:
 
   return 0;
 }
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 8
+ * fill-column: 78
+ * End:
+ */