ncurses 5.1

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

diff --git a/ncurses/trace/lib_tracechr.c b/ncurses/trace/lib_tracechr.c
index e97e67931464f1a18f5c7c29d5a53005f3c51737..bf004f35294ed54fc806aac449601ca85b1455d7 100644 (file)
--- a/ncurses/trace/lib_tracechr.c
+++ b/ncurses/trace/lib_tracechr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998,2000 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            *
@@ -31,36 +31,18 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-
-
 /*
  *     lib_tracechr.c - Tracing/Debugging routines
  */
-
-#ifndef TRACE
-#define TRACE                  /* turn on internal defs for this module */
-#endif
-
 #include <curses.priv.h>
 
-#include <ctype.h>
+MODULE_ID("$Id: lib_tracechr.c,v 1.2 2000/04/01 20:17:26 tom Exp $")
 
 #ifdef TRACE
 char *_tracechar(const unsigned char ch)
 {
     static char crep[20];
-    /* 
-     * We can show the actual character if it's either an ordinary printable
-     * or one of the high-half characters.
-     */
-    if (isprint(ch) || (ch & 0x80))
-    {
-       crep[0] = '\'';
-       crep[1] = ch;   /* necessary; printf tries too hard on metachars */
-       (void) sprintf(crep + 2, "' = 0x%02x", (unsigned)ch);
-    }
-    else
-       (void) sprintf(crep, "0x%02x", (unsigned)ch);
+    (void) sprintf(crep, "'%s' = 0x%02x", unctrl(ch), (unsigned)ch);
     return(crep);
 }
 #else