[libexif-cvs] libexif/libexif/pentax mnote-pentax-entry.c, 1.20, 1.21

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/pentax
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5408/libexif/pentax

Modified Files:
	mnote-pentax-entry.c 
Log Message:
Removed some redundant code. Renamed a variable to prevent shadowing another.


Index: mnote-pentax-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-entry.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -d -r1.20 -r1.21
--- mnote-pentax-entry.c	26 Sep 2009 08:18:20 -0000	1.20
+++ mnote-pentax-entry.c	28 Sep 2009 23:09:14 -0000	1.21
@@ -400,10 +400,6 @@ mnote_pentax_entry_get_value (MnotePenta
 			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 (MnotePenta
 		case EXIF_FORMAT_SHORT:
 		  {
 			const unsigned char *data = entry->data;
-		  	size_t i, len = strlen(val);
-		  	for(i=0; i<entry->components; i++) {
-				if ((i+1)*2 > entry->size) {
-					// Prevent buffer overflow
-					break;
-				}
+		  	size_t k, len = strlen(val);
+		  	for(k=0; k<entry->components; 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 (MnotePenta
 		case EXIF_FORMAT_LONG:
 		  {
 			const unsigned char *data = entry->data;
-		  	size_t i, len = strlen(val);
-		  	for(i=0; i<entry->components; i++) {
-				if ((i+1)*4 > entry->size) {
-					// Prevent buffer overflow
-					break;
-				}
+		  	size_t k, len = strlen(val);
+		  	for(k=0; k<entry->components; k++) {
 				vl = exif_get_long (data, entry->order);
 				snprintf (val+len, maxlen-len, "%li", (long int) vl);
 				len = strlen(val);