Attachment 51298 Details for Bug 118991

[patch] exif.pat

e.pat (text/plain), 1.03 KB, created by Marcus Meissner on 2005-10-01 16:37:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2005-10-01 16:37:34 UTC

Size: 1.03 KB

patch

obsolete

>Index: exif-entry.c
>===================================================================
>RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
>retrieving revision 1.90
>retrieving revision 1.91
>diff -u -r1.90 -r1.91
>--- exif-entry.c	15 Aug 2005 20:29:16 -0000	1.90
>+++ exif-entry.c	1 Oct 2005 16:32:41 -0000	1.91
>@@ -682,14 +682,15 @@
> 		strncat (val, _("(Photographer)"), maxlen - strlen (val));
> 
> 		/* Second part: Editor. */
>-		t = e->data + strlen ((char *) e->data) + 1;
>-		ts = e->data + e->size - t;
> 		strncat (val, " - ", maxlen - strlen (val));
>-		if (e->size && e->data && (ts > 0) &&
>-		    (strspn ((char *)t, " ") != ts))
>+		if (e->size && e->data) {
>+		    t = e->data + strlen ((char *) e->data) + 1;
>+		    ts = e->data + e->size - t;
>+		    if ((ts > 0) && (strspn ((char *)t, " ") != ts))
> 			strncat (val, (char *)t, MIN (maxlen - strlen (val), ts));
>-		else
>+		} else {
> 			strncat (val, _("[None]"), maxlen - strlen (val));
>+		}
> 		strncat (val, " ", maxlen - strlen (val));
> 		strncat (val, _("(Editor)"), maxlen - strlen (val));
>

Actions: View | Diff

Attachments on bug 118991: 50928 | 51298