Do not hardcode exif formatted prefix.

diff --git a/src/bar_exif.c b/src/bar_exif.c
index dcdd855..03b7c5e 100644 (file)
--- a/src/bar_exif.c
+++ b/src/bar_exif.c
@@ -30,24 +30,24 @@
 #define BAR_EXIF_DATA_COLUMN_WIDTH 250
 
 ExifUI ExifUIList[]={
-       { 0, 0, EXIF_UI_IFSET,  "formatted.Camera"},
-       { 0, 0, EXIF_UI_IFSET,  "formatted.DateTime"},
-       { 0, 0, EXIF_UI_IFSET,  "formatted.ShutterSpeed"},
-       { 0, 0, EXIF_UI_IFSET,  "formatted.Aperture"},
-       { 0, 0, EXIF_UI_IFSET,  "formatted.ExposureBias"},
-       { 0, 0, EXIF_UI_IFSET,  "formatted.ISOSpeedRating"},
-       { 0, 0, EXIF_UI_IFSET,  "formatted.FocalLength"},
-       { 0, 0, EXIF_UI_IFSET,  "formatted.FocalLength35mmFilm"},
-       { 0, 0, EXIF_UI_IFSET,  "formatted.Flash"},
+       { 0, 0, EXIF_UI_IFSET,  EXIF_FORMATTED("Camera")},
+       { 0, 0, EXIF_UI_IFSET,  EXIF_FORMATTED("DateTime")},
+       { 0, 0, EXIF_UI_IFSET,  EXIF_FORMATTED("ShutterSpeed")},
+       { 0, 0, EXIF_UI_IFSET,  EXIF_FORMATTED("Aperture")},
+       { 0, 0, EXIF_UI_IFSET,  EXIF_FORMATTED("ExposureBias")},
+       { 0, 0, EXIF_UI_IFSET,  EXIF_FORMATTED("ISOSpeedRating")},
+       { 0, 0, EXIF_UI_IFSET,  EXIF_FORMATTED("FocalLength")},
+       { 0, 0, EXIF_UI_IFSET,  EXIF_FORMATTED("FocalLength35mmFilm")},
+       { 0, 0, EXIF_UI_IFSET,  EXIF_FORMATTED("Flash")},
        { 0, 0, EXIF_UI_IFSET,  "Exif.Photo.ExposureProgram"},
        { 0, 0, EXIF_UI_IFSET,  "Exif.Photo.MeteringMode"},
        { 0, 0, EXIF_UI_IFSET,  "Exif.Photo.LightSource"},
-       { 0, 0, EXIF_UI_IFSET,  "formatted.ColorProfile"},
-       { 0, 0, EXIF_UI_IFSET,  "formatted.SubjectDistance"},
-       { 0, 0, EXIF_UI_IFSET,  "formatted.Resolution"},
+       { 0, 0, EXIF_UI_IFSET,  EXIF_FORMATTED("ColorProfile")},
+       { 0, 0, EXIF_UI_IFSET,  EXIF_FORMATTED("SubjectDistance")},
+       { 0, 0, EXIF_UI_IFSET,  EXIF_FORMATTED("Resolution")},
        { 0, 0, EXIF_UI_IFSET,  "Exif.Image.Orientation"},
-       { 0, 0, EXIF_UI_IFSET,  "formatted.GPSPosition"},
-       { 0, 0, EXIF_UI_IFSET,  "formatted.GPSAltitude"},
+       { 0, 0, EXIF_UI_IFSET,  EXIF_FORMATTED("GPSPosition")},
+       { 0, 0, EXIF_UI_IFSET,  EXIF_FORMATTED("GPSAltitude")},
        { 0, 0, EXIF_UI_IFSET,  "Exif.Image.ImageDescription"},
        { 0, 0, EXIF_UI_IFSET,  "Exif.Image.Copyright"},
        { 0, 0, EXIF_UI_OFF,    NULL}

diff --git a/src/exif-common.c b/src/exif-common.c
index c7c9e6b..1aba8ba 100644 (file)
--- a/src/exif-common.c
+++ b/src/exif-common.c
@@ -503,7 +503,7 @@ static gchar *exif_build_formatted_GPSAltitude(ExifData *exif)
 
 
 /* List of custom formatted pseudo-exif tags */
-#define EXIF_FORMATTED_TAG(name, label) { "formatted."#name, label, exif_build_formatted##_##name }
+#define EXIF_FORMATTED_TAG(name, label) { EXIF_FORMATTED()#name, label, exif_build_formatted##_##name }
 
 ExifFormattedText ExifFormattedList[] = {
        EXIF_FORMATTED_TAG(Camera,              N_("Camera")),
@@ -525,15 +525,15 @@ ExifFormattedText ExifFormattedList[] = {
 
 gchar *exif_get_formatted_by_key(ExifData *exif, const gchar *key, gint *key_valid)
 {
-       if (strncmp(key, "formatted.", 10) == 0)
+       if (strncmp(key, EXIF_FORMATTED(), EXIF_FORMATTED_LEN) == 0)
                {
                gint i;
 
                if (key_valid) *key_valid = TRUE;
 
-               key += 10;
+               key += EXIF_FORMATTED_LEN;
                for (i = 0; ExifFormattedList[i].key; i++)
-                       if (strcmp(key, ExifFormattedList[i].key + 10) == 0)
+                       if (strcmp(key, ExifFormattedList[i].key + EXIF_FORMATTED_LEN) == 0)
                                return ExifFormattedList[i].build_func(exif);
                }
 
@@ -545,13 +545,13 @@ gchar *exif_get_description_by_key(const gchar *key)
 {
        if (!key) return NULL;
 
-       if (strncmp(key, "formatted.", 10) == 0)
+       if (strncmp(key, EXIF_FORMATTED(), EXIF_FORMATTED_LEN) == 0)
                {
                gint i;
 
-               key += 10;
+               key += EXIF_FORMATTED_LEN;
                for (i = 0; ExifFormattedList[i].key; i++)
-                       if (strcmp(key, ExifFormattedList[i].key + 10) == 0)
+                       if (strcmp(key, ExifFormattedList[i].key + EXIF_FORMATTED_LEN) == 0)
                                return g_strdup(_(ExifFormattedList[i].description));
                }
 

diff --git a/src/exif.h b/src/exif.h
index d671304..5ed08a9 100644 (file)
--- a/src/exif.h
+++ b/src/exif.h
@@ -27,6 +27,8 @@
 #ifndef __EXIF_H
 #define __EXIF_H
 
+#define EXIF_FORMATTED(x) "formatted."x
+#define EXIF_FORMATTED_LEN (sizeof(EXIF_FORMATTED()) - 1)
 
 /*
  *-----------------------------------------------------------------------------