ncurses 6.0 - patch 20160910

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

diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index 7a8e6a9e752cd1003b2458ce78abe1a85a03dcf2..cec01de517f8c58a6fafa73091b86f05078e21f2 100644 (file)
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2013 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            *
@@ -47,7 +47,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_trace.c,v 1.77 2011/10/22 16:34:50 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.82 2013/07/06 19:42:09 tom Exp $")
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
@@ -103,9 +103,9 @@ trace(const unsigned int tracelevel)
            }
            TracePath[size] = '\0';
            assert(strlen(TracePath) <= size);
-           strcat(TracePath, "/trace");
+           _nc_STRCAT(TracePath, "/trace", sizeof(TracePath));
            if (_nc_is_dir_path(TracePath)) {
-               strcat(TracePath, ".log");
+               _nc_STRCAT(TracePath, ".log", sizeof(TracePath));
            }
        }
 
@@ -185,9 +185,9 @@ _nc_va_tracef(const char *fmt, va_list ap)
        if ((pthread_self))
 # endif
 #ifdef __MINGW32__
-           fprintf(TraceFP, "%#lx:", (long) (void *) pthread_self().p);
+           fprintf(TraceFP, "%#lx:", (long) (intptr_t) pthread_self().p);
 #else
-           fprintf(TraceFP, "%#lx:", (long) (void *) pthread_self());
+           fprintf(TraceFP, "%#lx:", (long) (intptr_t) pthread_self());
 #endif
 #endif
        if (before || after) {
@@ -229,7 +229,7 @@ NCURSES_EXPORT(char)
 _nc_retrace_char(int code)
 {
     T((T_RETURN("%c"), code));
-    return code;
+    return (char) code;
 }
 
 /* Trace 'int' return-values */
@@ -339,8 +339,9 @@ _nc_locked_tracef(const char *fmt,...)
     _nc_va_tracef(fmt, ap);
     va_end(ap);
 
-    if (--(_nc_globals.nested_tracef) == 0)
+    if (--(_nc_globals.nested_tracef) == 0) {
        _nc_unlock_global(tracef);
+    }
 }
 #endif /* USE_REENTRANT */