[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat/files revert last, and apply the ...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ffcc9a655c7e
branches:  trunk
changeset: 503316:ffcc9a655c7e
user:      grant <grant%pkgsrc.org@localhost>
date:      Fri Nov 18 09:03:06 2005 +0000

description:
revert last, and apply the simpler fix to the MAKEEXTRALIST macro in
NetBSD libc from martin@

diffstat:

 pkgtools/libnbcompat/files/vis.c |  16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diffs (63 lines):

diff -r cec4df922596 -r ffcc9a655c7e pkgtools/libnbcompat/files/vis.c
--- a/pkgtools/libnbcompat/files/vis.c  Fri Nov 18 08:58:12 2005 +0000
+++ b/pkgtools/libnbcompat/files/vis.c  Fri Nov 18 09:03:06 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vis.c,v 1.8 2005/11/18 03:31:11 grant Exp $    */
+/*     $NetBSD: vis.c,v 1.9 2005/11/18 09:03:06 grant Exp $    */
 
 /*-
  * Copyright (c) 1989, 1993
@@ -68,7 +68,7 @@
 #include <nbcompat.h>
 #include <nbcompat/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vis.c,v 1.8 2005/11/18 03:31:11 grant Exp $");
+__RCSID("$NetBSD: vis.c,v 1.9 2005/11/18 09:03:06 grant Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #if 0
@@ -107,8 +107,9 @@
 #define MAXEXTRAS      5
 
 
-#define MAKEEXTRALIST(flag, extra, orig)                                     \
+#define MAKEEXTRALIST(flag, extra, orig_str)                                 \
 do {                                                                         \
+       const char *orig = orig_str;                                          \
        const char *o = orig;                                                 \
        char *e;                                                              \
        while (*o++)                                                          \
@@ -329,11 +330,10 @@
 
 {
        char *extra;
-       const char *emptystr = "";
 
        _DIAGASSERT(dst != NULL);
 
-       MAKEEXTRALIST(flag, extra, emptystr);
+       MAKEEXTRALIST(flag, extra, "");
        if (flag & VIS_HTTPSTYLE)
                HVIS(dst, c, flag, nextc, extra);
        else
@@ -360,9 +360,8 @@
        int flag;
 {
        char *extra;
-       const char *emptystr = "";
 
-       MAKEEXTRALIST(flag, extra, emptystr);
+       MAKEEXTRALIST(flag, extra, "");
        return (strsvis(dst, src, flag, extra));
 }
 
@@ -375,8 +374,7 @@
        int flag;
 {
        char *extra;
-       const char *emptystr = "";
 
-       MAKEEXTRALIST(flag, extra, emptystr);
+       MAKEEXTRALIST(flag, extra, "");
        return (strsvisx(dst, src, len, flag, extra));
 }