From f3b3bef4b777bc585a681f276eb19fd86b093ac6 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Mon, 28 Sep 2009 16:09:14 -0700 Subject: [PATCH] Removed some redundant code. Renamed a variable to prevent shadowing another. --- libexif/exif-content.h | 1 + libexif/pentax/mnote-pentax-entry.c | 20 ++++---------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/libexif/exif-content.h b/libexif/exif-content.h index b7a200b..fbd8a1d 100644 --- a/libexif/exif-content.h +++ b/libexif/exif-content.h @@ -93,6 +93,7 @@ void exif_content_fix (ExifContent *c); typedef void (* ExifContentForeachEntryFunc) (ExifEntry *, void *user_data); /*! Executes function on each EXIF tag in this IFD in turn. + * The tags will not necessarily be visited in numerical order. * * \param[in,out] content IFD over which to iterate * \param[in] func function to call for each entry diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c index aa2cc65..4c2ae79 100644 --- a/libexif/pentax/mnote-pentax-entry.c +++ b/libexif/pentax/mnote-pentax-entry.c @@ -400,10 +400,6 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, entry->size); break; case MNOTE_PENTAX_TAG_TZ_CITY: - CF (entry->format, EXIF_FORMAT_UNDEFINED, val, maxlen); - CC (entry->components, 4, val, maxlen); - strncpy (val, (char*)entry->data, MIN(maxlen, entry->size)); - break; case MNOTE_PENTAX_TAG_TZ_DST: CF (entry->format, EXIF_FORMAT_UNDEFINED, val, maxlen); CC (entry->components, 4, val, maxlen); @@ -417,12 +413,8 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, case EXIF_FORMAT_SHORT: { const unsigned char *data = entry->data; - size_t i, len = strlen(val); - for(i=0; icomponents; i++) { - if ((i+1)*2 > entry->size) { - // Prevent buffer overflow - break; - } + size_t k, len = strlen(val); + for(k=0; kcomponents; k++) { vs = exif_get_short (data, entry->order); snprintf (val+len, maxlen-len, "%i ", vs); len = strlen(val); @@ -433,12 +425,8 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, case EXIF_FORMAT_LONG: { const unsigned char *data = entry->data; - size_t i, len = strlen(val); - for(i=0; icomponents; i++) { - if ((i+1)*4 > entry->size) { - // Prevent buffer overflow - break; - } + size_t k, len = strlen(val); + for(k=0; kcomponents; k++) { vl = exif_get_long (data, entry->order); snprintf (val+len, maxlen-len, "%li", (long int) vl); len = strlen(val); -- 2.7.4