From 90bf936ffa01bb1c8fbb0351f896cbf9c4f81dd2 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Fri, 1 Aug 2003 01:39:01 +0000
Subject: From Chris Heath: fix up the check for printable ASCII done on
 Windows not to include DEL as printable ASCII.

Also change the check in strutil.c to do it by redefining "isprint()",
as is done in "gtk/gtkglobals.h", rather than by #ifdeffing the point at
which the test is done.

svn path=/trunk/; revision=8118
---
 epan/strutil.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'epan/strutil.c')

diff --git a/epan/strutil.c b/epan/strutil.c
index 17f5834ceb..45ea39dbff 100644
--- a/epan/strutil.c
+++ b/epan/strutil.c
@@ -1,7 +1,7 @@
 /* strutil.c
  * String utility routines
  *
- * $Id: strutil.c,v 1.10 2002/12/31 21:51:10 guy Exp $
+ * $Id: strutil.c,v 1.11 2003/08/01 01:39:00 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -133,6 +133,19 @@ get_token_len(const guchar *linep, const guchar *lineend,
 
 #define	INITIAL_FMTBUF_SIZE	128
 
+#ifdef _WIN32
+/*
+ * XXX - "isprint()" can return "true" for non-ASCII characters, but
+ * those don't work with GTK+ on Windows, as GTK+ on Windows assumes
+ * UTF-8 strings.  Until we fix up Ethereal to properly handle
+ * non-ASCII characters in all output (both GUI displays and text
+ * printouts) on all platforms including Windows, we work around
+ * the problem by escaping all characters that aren't printable ASCII.
+ */
+#undef isprint
+#define isprint(c) (c >= 0x20 && c < 0x7f)
+#endif
+
 /*
  * Given a string, generate a string from it that shows non-printable
  * characters as C-style escapes, and return a pointer to it.
@@ -173,19 +186,7 @@ format_text(const guchar *string, int len)
     }
     c = *string++;
 
-#ifdef _WIN32
-    /*
-     * XXX - "isprint()" can return "true" for non-ASCII characters, but
-     * those don't work with GTK+ on Windows, as GTK+ on Windows assumes
-     * UTF-8 strings.  Until we fix up Ethereal to properly handle
-     * non-ASCII characters in all output (both GUI displays and text
-     * printouts) on all platforms including Windows, we work around
-     * the problem by escaping all characters that aren't printable ASCII.
-     */
-    if (c >= 0x20 && c <= 0x7f) {
-#else
     if (isprint(c)) {
-#endif
       fmtbuf[column] = c;
       column++;
     } else {
-- 
cgit v1.2.3