ncurses 6.0 - patch 20160528

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

diff --git a/ncurses/trace/lib_tracedmp.c b/ncurses/trace/lib_tracedmp.c
index 0fda15b252e6ec7793dbe48bc62fc9a742755023..c8b7b05c20351b3fdc126d24057c1aa500e6df70 100644 (file)
--- a/ncurses/trace/lib_tracedmp.c
+++ b/ncurses/trace/lib_tracedmp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2016 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -39,7 +39,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
 #include <curses.priv.h>
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_tracedmp.c,v 1.34 2012/10/27 20:54:42 tom Exp $")
+MODULE_ID("$Id: lib_tracedmp.c,v 1.35 2016/05/28 23:30:01 tom Exp $")

 
 #ifdef TRACE
 
 
 #ifdef TRACE
 


@@ -76,7 +76,7 @@ _tracedump(const char *name, WINDOW *win)
 
     for (n = 0; n <= win->_maxy; ++n) {
        char *ep = my_buffer;
 
     for (n = 0; n <= win->_maxy; ++n) {
        char *ep = my_buffer;

-       bool haveattrs, havecolors;
+       bool havecolors;

 
        /*
         * Dump A_CHARTEXT part.  It is more important to make the grid line up
 
        /*
         * Dump A_CHARTEXT part.  It is more important to make the grid line up


@@ -156,8 +156,8 @@ _tracedump(const char *name, WINDOW *win)
        for (i = 0; i < 4; ++i) {
            const char *hex = " 123456789ABCDEF";
            attr_t mask = (attr_t) (0xf << ((i + 4) * 4));
        for (i = 0; i < 4; ++i) {
            const char *hex = " 123456789ABCDEF";
            attr_t mask = (attr_t) (0xf << ((i + 4) * 4));

+           bool haveattrs = FALSE;

 
 

-           haveattrs = FALSE;

            for (j = 0; j < width; ++j)
                if (AttrOf(win->_line[n].text[j]) & mask) {
                    haveattrs = TRUE;
            for (j = 0; j < width; ++j)
                if (AttrOf(win->_line[n].text[j]) & mask) {
                    haveattrs = TRUE;