Removed some FIXME comments.

diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index cbb942f..2ce1bb5 100644 (file)
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -202,8 +202,8 @@ exif_data_load_data_entry (ExifData *data, ExifEntry *entry,
                entry->size = s;
                memcpy (entry->data, d + doff, s);
        } else {
-               /* FIXME: What do our callers do if (entry->data == NULL)? */
                EXIF_LOG_NO_MEMORY(data->priv->log, "ExifData", s);
+               return 0;
        }
 
        /* If this is the MakerNote, remember the offset */

diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c
index 2866223..b64f5d9 100644 (file)
--- a/libexif/exif-entry.c
+++ b/libexif/exif-entry.c
@@ -852,13 +852,6 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
                {""    , 0,  0}
        };
 
-       /* FIXME: This belongs to somewhere else. */
-       /* libexif should use the default system locale.
-        * If an application specifically requires UTF-8, then we
-        * must give the application a way to tell libexif that.
-        * 
-        * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-        */
        bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 
        if (!e || !e->parent || !e->parent->parent || !maxlen)

diff --git a/libexif/exif-format.c b/libexif/exif-format.c
index 2c63c33..90e8d9f 100644 (file)
--- a/libexif/exif-format.c
+++ b/libexif/exif-format.c
@@ -54,13 +54,6 @@ exif_format_get_name (ExifFormat format)
 {
        unsigned int i;
 
-       /* FIXME: This belongs to somewhere else. */
-       /* libexif should use the default system locale.
-        * If an application specifically requires UTF-8, then we
-        * must give the application a way to tell libexif that.
-        * 
-        * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-        */
        bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 
        for (i = 0; ExifFormatTable[i].name; i++)

diff --git a/libexif/exif-tag.c b/libexif/exif-tag.c
index 2236921..6d174fe 100644 (file)
--- a/libexif/exif-tag.c
+++ b/libexif/exif-tag.c
@@ -995,13 +995,6 @@ exif_tag_get_title_in_ifd (ExifTag tag, ExifIfd ifd)
                } else
                        return NULL; /* Recorded tag not found in the table */
        }
-       /* FIXME: This belongs to somewhere else. */
-       /* libexif should use the default system locale.
-        * If an application specifically requires UTF-8, then we
-        * must give the application a way to tell libexif that.
-        * 
-        * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-        */
        bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        return _(ExifTagTable[i].title);
 }