Subtract (not add!) preamble length from remaining buffer length.

[obnox/wireshark/wip.git] / isprint.h

diff --git a/isprint.h b/isprint.h
index 7f47ad5e83817326f2315224300acb63bb72f85c..e4f4d38db9d2dd2416c6d2aa1c9720fca2fd47c6 100644 (file)
--- a/isprint.h
+++ b/isprint.h
@@ -2,10 +2,10 @@
  * Temporary redefinition of "isprint()" to cope with GTK+ 1.3 and
  * later using UTF-8 strings
  *
- * $Id: isprint.h,v 1.1 2004/07/09 23:17:02 guy Exp $
+ * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -26,21 +26,15 @@
 #ifndef __ISPRINT_H__
 #define __ISPRINT_H__
 
-#if GLIB_MAJOR_VERSION >= 2
 /*
  * XXX - "isprint()" can return "true" for non-ASCII characters, but
  * those don't work with GTK+ 1.3 or later, as they take UTF-8 strings
- * as input.  Until we fix up Ethereal to properly handle non-ASCII
+ * as input.  Until we fix up Wireshark to properly handle non-ASCII
  * characters in all output (both GUI displays and text printouts)
  * in those versions of GTK+, we work around the problem by escaping
  * all characters that aren't printable ASCII.
- *
- * We don't know what version of GTK+ we're using, as dissectors don't
- * use any GTK+ stuff; we use GLib as a proxy for that, with GLib 2.x
- * implying GTK+ 1.3 or later (we don't support GLib 1.3[.x]).
  */
 #undef isprint
 #define isprint(c) (c >= 0x20 && c < 0x7f)
-#endif
 
 #endif