libextractor

commit 717b91c786773dc5afa11a53385f9b016bc32d91
parent 18cdf49c05d1a1e74c36145262b9b99034b886b5
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed,  2 Jan 2008 09:29:55 +0000

better

Diffstat:
M
src/plugins/exiv2/nikonmn.cpp
 | 
2
+-
M
src/plugins/exiv2/tags.hpp
 | 
2
+-
M
src/plugins/lowerextractor.c
 | 
3
++-

3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/plugins/exiv2/nikonmn.cpp b/src/plugins/exiv2/nikonmn.cpp
@@ -682,7 +682,7 @@ namespace Exiv2 {
         //#
         //#"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"},
diff --git a/src/plugins/exiv2/tags.hpp b/src/plugins/exiv2/tags.hpp
@@ -115,7 +115,7 @@ namespace Exiv2 {
      */
     struct TagDetails {
         long val_;                              //!< Tag value
-        char* label_;                           //!< Translation of the tag value
+        const char* label_;                           //!< Translation of the tag value
     }; // struct TagDetails
 
     /*!
diff --git a/src/plugins/lowerextractor.c b/src/plugins/lowerextractor.c
@@ -73,7 +73,8 @@ libextractor_lower_extract (char *filename,
         }
       pos = pos->next;
     }
-  free (lower);
+  if (lower != NULL)
+    free (lower);
 
   return prev;
 }