Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14568
Modified Files:
exif-entry.c
Log Message:
Internalized some strings into a const struct to make it smaller and
reduce the amount of run-time linking required
Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -d -r1.118 -r1.119
--- exif-entry.c 17 Feb 2008 18:31:55 -0000 1.118
+++ exif-entry.c 18 Nov 2008 09:42:58 -0000 1.119
@@ -569,7 +569,7 @@ exif_entry_get_value (ExifEntry *e, char
double d;
ExifEntry *entry;
static const struct {
- const char *label;
+ char label[5];
char major, minor;
} versions[] = {
{"0110", 1, 1},
@@ -578,7 +578,7 @@ exif_entry_get_value (ExifEntry *e, char
{"0210", 2, 1},
{"0220", 2, 2},
{"0221", 2, 21},
- {NULL , 0, 0}
+ {"" , 0, 0}
};
/* FIXME: This belongs to somewhere else. */
@@ -668,7 +668,7 @@ exif_entry_get_value (ExifEntry *e, char
CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
CC (e, 4, val, maxlen);
strncpy (val, _("Unknown Exif Version"), maxlen);
- for (i = 0; versions[i].label; i++) {
+ for (i = 0; *versions[i].label; i++) {
if (!memcmp (e->data, versions[i].label, 4)) {
snprintf (val, maxlen,
_("Exif Version %d.%d"),
|
