ncurses 5.9 - patch 20110528

[ncurses.git] / ncurses / trace / visbuf.c

diff --git a/ncurses/trace/visbuf.c b/ncurses/trace/visbuf.c
index 820f84cb8fa2888bfc50d9938d3ade953ae3aa08..66da4f4beca3cef79d9a9d5a9d47715d11ed031b 100644 (file)
--- a/ncurses/trace/visbuf.c
+++ b/ncurses/trace/visbuf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2001-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 2001-2009,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -42,7 +42,7 @@
 #include <tic.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: visbuf.c,v 1.34 2009/10/10 20:41:55 tom Exp $")
+MODULE_ID("$Id: visbuf.c,v 1.37 2010/05/29 18:51:41 tom Exp $")
 
 #define NUM_VISBUFS 4
 
@@ -94,7 +94,7 @@ _nc_vischar(char *tp, unsigned c)
 static const char *
 _nc_visbuf2n(int bufnum, const char *buf, int len)
 {
-    const char *vbuf;
+    const char *vbuf = 0;
     char *tp;
     int c;
 
@@ -128,7 +128,7 @@ _nc_visbuf2n(int bufnum, const char *buf, int len)
            tp = _nc_vischar(tp, UChar(c));
        }
        *tp++ = D_QUOTE;
-       *tp++ = '\0';
+       *tp = '\0';
     } else {
        vbuf = ("(_nc_visbuf2n failed)");
     }
@@ -205,7 +205,7 @@ _nc_viswbuf2n(int bufnum, const wchar_t *buf, int len)
            }
        }
        *tp++ = D_QUOTE;
-       *tp++ = '\0';
+       *tp = '\0';
     } else {
        vbuf = ("(_nc_viswbuf2n failed)");
     }
@@ -287,12 +287,12 @@ _nc_viscbuf2(int bufnum, const NCURSES_CH_T * buf, int len)
                }
            }
 
-           result = _nc_trace_bufcat(bufnum, l_brace);
-           result = _nc_trace_bufcat(bufnum, d_quote);
+           (void) _nc_trace_bufcat(bufnum, l_brace);
+           (void) _nc_trace_bufcat(bufnum, d_quote);
            for (j = first; j <= last; ++j) {
                found = _nc_altcharset_name(attr, (chtype) CharOf(buf[j]));
                if (found != 0) {
-                   result = _nc_trace_bufcat(bufnum, found);
+                   (void) _nc_trace_bufcat(bufnum, found);
                    attr &= ~A_ALTCHARSET;
                } else
 #if USE_WIDEC_SUPPORT
@@ -304,8 +304,11 @@ _nc_viscbuf2(int bufnum, const NCURSES_CH_T * buf, int len)
                        int k;
 
                        PUTC_ch = buf[j].chars[PUTC_i];
-                       if (PUTC_ch == L'\0')
+                       if (PUTC_ch == L'\0') {
+                           if (PUTC_i == 0)
+                               (void) _nc_trace_bufcat(bufnum, "\\000");
                            break;
+                       }
                        PUTC_n = (int) wcrtomb(PUTC_buf,
                                               buf[j].chars[PUTC_i], &PUT_st);
                        if (PUTC_n <= 0)
@@ -313,7 +316,7 @@ _nc_viscbuf2(int bufnum, const NCURSES_CH_T * buf, int len)
                        for (k = 0; k < PUTC_n; k++) {
                            char temp[80];
                            _nc_vischar(temp, UChar(PUTC_buf[k]));
-                           result = _nc_trace_bufcat(bufnum, temp);
+                           (void) _nc_trace_bufcat(bufnum, temp);
                        }
                    }
                }
@@ -325,10 +328,10 @@ _nc_viscbuf2(int bufnum, const NCURSES_CH_T * buf, int len)
                }
 #endif /* USE_WIDEC_SUPPORT */
            }
-           result = _nc_trace_bufcat(bufnum, d_quote);
+           (void) _nc_trace_bufcat(bufnum, d_quote);
            if (attr != A_NORMAL) {
-               result = _nc_trace_bufcat(bufnum, " | ");
-               result = _nc_trace_bufcat(bufnum, _traceattr2(bufnum + 20, attr));
+               (void) _nc_trace_bufcat(bufnum, " | ");
+               (void) _nc_trace_bufcat(bufnum, _traceattr2(bufnum + 20, attr));
            }
            result = _nc_trace_bufcat(bufnum, r_brace);
            first = last + 1;