ncurses 6.0 - patch 20171223

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

diff --git a/ncurses/trace/lib_traceatr.c b/ncurses/trace/lib_traceatr.c
index f62a8a73793d924c8c3541d8a09b3ae7e1821952..1ed5a5ecae3d692a7b5c044e6dde0049e1596510 100644 (file)
--- a/ncurses/trace/lib_traceatr.c
+++ b/ncurses/trace/lib_traceatr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 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            *
@@ -43,7 +43,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_traceatr.c,v 1.87 2016/09/05 00:44:51 tom Exp $")
+MODULE_ID("$Id: lib_traceatr.c,v 1.89 2017/10/21 23:12:09 tom Exp $")
 
 #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
 
@@ -67,7 +67,7 @@ color_of(int c)
     if (c != my_cached) {
        my_cached = c;
        my_select = !my_select;
-       if (c == COLOR_DEFAULT)
+       if (isDefaultColor(c))
            _nc_STRCPY(my_buffer[my_select], "default",
                       COLOR_BUF_SIZE(my_select));
        else
@@ -362,9 +362,9 @@ _tracecchar_t2(int bufnum, const cchar_t *ch)
                    } else if (ch->chars[PUTC_i] > 255) {
                        char temp[80];
                        _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
-                                   "{%d:\\u%x}",
+                                   "{%d:\\u%lx}",
                                    wcwidth(ch->chars[PUTC_i]),
-                                   ch->chars[PUTC_i]);
+                                   (unsigned long) ch->chars[PUTC_i]);
                        (void) _nc_trace_bufcat(bufnum, temp);
                        break;
                    }