[libexif-cvs] exif/exif main.c,1.56,1.57

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

Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3993/exif

Modified Files:
	main.c 
Log Message:
exif/main.c: Fixed the output of -t and -s when iconv is configured.


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -d -r1.56 -r1.57
--- main.c	24 Jun 2007 16:44:02 -0000	1.56
+++ main.c	8 Nov 2007 06:30:04 -0000	1.57
@@ -71,11 +71,17 @@ show_entry (ExifEntry *entry, unsigned i
 		return;
 	}
 
-	printf (_("EXIF entry '%s' (0x%x, '%s') exists in IFD '%s':"),
-		C(exif_tag_get_title_in_ifd (entry->tag, ifd)), entry->tag,
-		C(exif_tag_get_name_in_ifd (entry->tag, ifd)), 
+	/*
+	 * The C() macro can point to a static buffer so these printfs
+	 * must be done separately.
+	 */
+	printf (_("EXIF entry '%s' "),
+		C(exif_tag_get_title_in_ifd (entry->tag, ifd)));
+	printf (_("(0x%x, '%s') "),
+		entry->tag,
+		C(exif_tag_get_name_in_ifd (entry->tag, ifd)));
+	printf (_("exists in IFD '%s':\n"),
 		C(exif_ifd_get_name (ifd)));
-	printf ("\n");
 
 	exif_entry_dump (entry, 0);
 }
@@ -417,11 +423,17 @@ main (int argc, const char **argv)
 
 	if (show_description) {
 		if (!eo.tag) exif_log (log, -1, "exif", _("Please specify a tag!"));
-		printf (_("Tag '%s' (0x%04x, '%s'): %s"),
-			C(exif_tag_get_title_in_ifd (eo.tag, ifd)), eo.tag,
-			C(exif_tag_get_name_in_ifd (eo.tag, ifd)),
+		/*
+		 * The C() macro can point to a static buffer so these printfs
+		 * must be done separately.
+		 */
+		printf (_("Tag '%s' "),
+			C(exif_tag_get_title_in_ifd (eo.tag, ifd)));
+		printf (_("(0x%04x, '%s'): "),
+			eo.tag,
+			C(exif_tag_get_name_in_ifd (eo.tag, ifd)));
+		printf ("%s\n",
 			C(exif_tag_get_description_in_ifd (eo.tag, ifd)));
-		printf ("\n");
 		return (0);
 	}