ncurses 5.9 - patch 20120721

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

diff --git a/ncurses/trace/lib_tracedmp.c b/ncurses/trace/lib_tracedmp.c
index d56d1a5d48b09ec621a3d27442a049bc1bc4e6f8..734532597f4c8faf8d4f5713f5ae42e48e9593d2 100644 (file)
--- a/ncurses/trace/lib_tracedmp.c
+++ b/ncurses/trace/lib_tracedmp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2012 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.29 2007/06/30 23:01:19 tom Exp $")
+MODULE_ID("$Id: lib_tracedmp.c,v 1.33 2012/06/09 20:29:33 tom Exp $")

 
 #ifdef TRACE
 
 
 #ifdef TRACE
 


@@ -68,7 +68,7 @@ _tracedump(const char *name, WINDOW *win)
     if (width < win->_maxx)
        ++width;
     if (++width + 1 > (int) my_length) {
     if (width < win->_maxx)
        ++width;
     if (++width + 1 > (int) my_length) {

-       my_length = 2 * (width + 1);
+       my_length = (unsigned) (2 * (width + 1));

        my_buffer = typeRealloc(char, my_length, my_buffer);
     }
 
        my_buffer = typeRealloc(char, my_length, my_buffer);
     }
 


@@ -82,16 +82,16 @@ _tracedump(const char *name, WINDOW *win)
         * we map those to '.' and '?' respectively.
         */
        for (j = 0; j < width; ++j) {
         * we map those to '.' and '?' respectively.
         */
        for (j = 0; j < width; ++j) {

-           chtype test = CharOf(win->_line[n].text[j]);
-           ep[j] = (UChar(test) == test
+           chtype test = (chtype) CharOf(win->_line[n].text[j]);
+           ep[j] = (char) ((UChar(test) == test

 #if USE_WIDEC_SUPPORT
 #if USE_WIDEC_SUPPORT

-                    && (win->_line[n].text[j].chars[1] == 0)
+                            && (win->_line[n].text[j].chars[1] == 0)

 #endif
 #endif

-               )
-               ? (iscntrl(UChar(test))
-                  ? '.'
-                  : UChar(test))
-               : '?';
+                           )
+                           ? (iscntrl(UChar(test))
+                              ? '.'
+                              : UChar(test))
+                           : '?');

        }
        ep[j] = '\0';
        _tracef("%s[%2d] %3ld%3ld ='%s'",
        }
        ep[j] = '\0';
        _tracef("%s[%2d] %3ld%3ld ='%s'",


@@ -113,7 +113,7 @@ _tracedump(const char *name, WINDOW *win)
                for (j = 0; j < width; ++j) {
                    int test = WidecExt(win->_line[n].text[j]);
                    if (test) {
                for (j = 0; j < width; ++j) {
                    int test = WidecExt(win->_line[n].text[j]);
                    if (test) {

-                       ep[j] = test + '0';
+                       ep[j] = (char) (test + '0');

                    } else {
                        ep[j] = ' ';
                    }
                    } else {
                        ep[j] = ' ';
                    }


@@ -138,11 +138,11 @@ _tracedump(const char *name, WINDOW *win)
                if (pair >= 52)
                    ep[j] = '?';
                else if (pair >= 36)
                if (pair >= 52)
                    ep[j] = '?';
                else if (pair >= 36)

-                   ep[j] = pair + 'A';
+                   ep[j] = (char) (pair + 'A');

                else if (pair >= 10)
                else if (pair >= 10)

-                   ep[j] = pair + 'a';
+                   ep[j] = (char) (pair + 'a');

                else if (pair >= 1)
                else if (pair >= 1)

-                   ep[j] = pair + '0';
+                   ep[j] = (char) (pair + '0');

                else
                    ep[j] = ' ';
            }
                else
                    ep[j] = ' ';
            }


@@ -153,7 +153,7 @@ _tracedump(const char *name, WINDOW *win)
 
        for (i = 0; i < 4; ++i) {
            const char *hex = " 123456789ABCDEF";
 
        for (i = 0; i < 4; ++i) {
            const char *hex = " 123456789ABCDEF";

-           attr_t mask = (0xf << ((i + 4) * 4));
+           attr_t mask = (attr_t) (0xf << ((i + 4) * 4));

 
            haveattrs = FALSE;
            for (j = 0; j < width; ++j)
 
            haveattrs = FALSE;
            for (j = 0; j < width; ++j)


@@ -180,5 +180,5 @@ _tracedump(const char *name, WINDOW *win)
 }
 
 #else
 }
 
 #else

-empty_module(_nc_lib_tracedmp)
+EMPTY_MODULE(_nc_lib_tracedmp)

 #endif /* TRACE */
 #endif /* TRACE */