2004-06-23 Serge Droz <serge.droz@psi.ch>

	(committed by Lutz Mueller <lutz@users.sourceforge.net>)

        * libexif/olympus/mnote-olympus-entry.c: Reapply Jan Patera's
          change.

diff --git a/ChangeLog b/ChangeLog
index b7ae012..5054ec1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-23  Serge Droz <serge.droz@psi.ch>
+
+       (committed by Lutz Mueller <lutz@users.sourceforge.net>)
+
+        * libexif/olympus/mnote-olympus-entry.c: Reapply Jan Patera's 
+          change.
+
 2004-06-22  Lutz Mueller <lutz@users.sourceforge.net>
 
        * libexif/olympus/mnote-olympus-entry.c: Correct the usage of 

diff --git a/libexif/olympus/mnote-olympus-entry.c b/libexif/olympus/mnote-olympus-entry.c
index 129f582..3874b6e 100644 (file)
--- a/libexif/olympus/mnote-olympus-entry.c
+++ b/libexif/olympus/mnote-olympus-entry.c
@@ -164,7 +164,7 @@ static struct {
 char *
 mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int maxlen)
 {
-       char         buf[300];
+       char         buf[30];
        ExifLong     vl;
        ExifShort    vs = 0;
        ExifRational vr;
@@ -524,11 +524,11 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
                        break;
                case EXIF_FORMAT_UNDEFINED:
                default:
-                       snprintf (v, maxlen, "%li bytes unknown data:",
+                       snprintf (v, maxlen, _("%li bytes unknown data: "),
                                  entry->size);
                        for (i = 0; i < entry->size; i++) {
-                               sprintf (buf, " %02x", entry->data[i]);
-                               strncat (v, buf, maxlen);
+                               sprintf (buf, "%02x", entry->data[i]);
+                               strncat (v, buf, maxlen - strlen (v));
                        }
                        break;
                }