[GNUnet-SVN] r6074 - in Extractor/src/plugins: . exiv2

[gnunet]

Author: grothoff
Date: 2008-01-02 02:29:55 -0700 (Wed, 02 Jan 2008)
New Revision: 6074

Modified:
   Extractor/src/plugins/exiv2/nikonmn.cpp
   Extractor/src/plugins/exiv2/tags.hpp
   Extractor/src/plugins/lowerextractor.c
Log:
better

Modified: Extractor/src/plugins/exiv2/nikonmn.cpp
===================================================================
--- Extractor/src/plugins/exiv2/nikonmn.cpp     2008-01-02 09:04:13 UTC (rev 
6073)
+++ Extractor/src/plugins/exiv2/nikonmn.cpp     2008-01-02 09:29:55 UTC (rev 
6074)
@@ -682,7 +682,7 @@
         //#
         //#"data from TAG 0x98" "ltyp""manuf" "lens name from manuf";
         //#
-        struct {unsigned char lid,stps,focs,focl,aps,apl,lfw, ltype; char 
*manuf, *lensname;}
+        struct {unsigned char lid,stps,focs,focl,aps,apl,lfw, ltype; const 
char *manuf, *lensname;}
         fmountlens[] = {
             {0x01,0x58,0x50,0x50,0x14,0x14,0x02,0x00, "Nikon", "AF Nikkor 50mm 
f/1.8"},
             {0x02,0x42,0x44,0x5C,0x2A,0x34,0x08,0x00, "Nikon", "AF Zoom-Nikkor 
35-70mm f/3.3-4.5"},

Modified: Extractor/src/plugins/exiv2/tags.hpp
===================================================================
--- Extractor/src/plugins/exiv2/tags.hpp        2008-01-02 09:04:13 UTC (rev 
6073)
+++ Extractor/src/plugins/exiv2/tags.hpp        2008-01-02 09:29:55 UTC (rev 
6074)
@@ -115,7 +115,7 @@
      */
     struct TagDetails {
         long val_;                              //!< Tag value
-        char* label_;                           //!< Translation of the tag 
value
+        const char* label_;                           //!< Translation of the 
tag value
     }; // struct TagDetails
 
     /*!

Modified: Extractor/src/plugins/lowerextractor.c
===================================================================
--- Extractor/src/plugins/lowerextractor.c      2008-01-02 09:04:13 UTC (rev 
6073)
+++ Extractor/src/plugins/lowerextractor.c      2008-01-02 09:29:55 UTC (rev 
6074)
@@ -73,7 +73,8 @@
         }
       pos = pos->next;
     }
-  free (lower);
+  if (lower != NULL)
+    free (lower);
 
   return prev;
 }