Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / telnet.h

diff --git a/telnet.h b/telnet.h
index 1f15b72e6398f41a3d7fe8eb83fe3a99b1ee5265..33a07be9482e56041c33108fae10e68cc66f8496 100644 (file)
--- a/telnet.h
+++ b/telnet.h
@@ -1,6 +1,6 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/telnet.h,v 1.2 2001-06-28 10:17:25 guy Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/telnet.h,v 1.5 2007-08-29 02:31:44 mcr Exp $ (LBL) */
 
-/*     $NetBSD: telnet.h,v 1.9 2001/06/11 01:50:50 wiz Exp $   */
+/*     NetBSD: telnet.h,v 1.9 2001/06/11 01:50:50 wiz Exp      */
 
 /*
  * Copyright (c) 1983, 1993
@@ -67,7 +67,7 @@
 #define SYNCH  242             /* for telfunc calls */
 
 #ifdef TELCMDS
-char *telcmds[] = {
+const char *telcmds[] = {
        "EOF", "SUSP", "ABORT", "EOR",
        "SE", "NOP", "DMARK", "BRK", "IP", "AO", "AYT", "EC",
        "EL", "GA", "SB", "WILL", "WONT", "DO", "DONT", "IAC", 0,
@@ -128,7 +128,7 @@ extern char *telcmds[];
 
 #define        NTELOPTS        (1+TELOPT_NEW_ENVIRON)
 #ifdef TELOPTS
-char *telopts[NTELOPTS+1] = {
+const char *telopts[NTELOPTS+1] = {
        "BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME",
        "STATUS", "TIMING MARK", "RCTE", "NAOL", "NAOP",
        "NAOCRD", "NAOHTS", "NAOHTD", "NAOFFD", "NAOVTS",
@@ -220,15 +220,15 @@ char *telopts[NTELOPTS+1] = {
  * list of names if SLC_NAMES is not defined.
  */
 #define        SLC_NAMELIST    "0", "SYNCH", "BRK", "IP", "AO", "AYT", "EOR",  \
-                       "ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP", \
-                       "LNEXT", "XON", "XOFF", "FORW1", "FORW2",       \
-                       "MCL", "MCR", "MCWL", "MCWR", "MCBOL",          \
-                       "MCEOL", "INSRT", "OVER", "ECR", "EWR",         \
-                       "EBOL", "EEOL",                                 \
-                       0,
+                       "ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP", \
+                       "LNEXT", "XON", "XOFF", "FORW1", "FORW2",       \
+                       "MCL", "MCR", "MCWL", "MCWR", "MCBOL",          \
+                       "MCEOL", "INSRT", "OVER", "ECR", "EWR",         \
+                       "EBOL", "EEOL",                                 \
+                       0,
 
 #ifdef SLC_NAMES
-char *slc_names[] = {
+const char *slc_names[] = {
        SLC_NAMELIST
 };
 #else
@@ -295,7 +295,7 @@ extern char *slc_names[];
 #define        AUTHTYPE_TEST           99
 
 #ifdef AUTH_NAMES
-char *authtype_names[] = {
+const char *authtype_names[] = {
        "NULL", "KERBEROS_V4", "KERBEROS_V5", "SPX", "MINK", 0,
 };
 #else
@@ -325,12 +325,12 @@ extern char *authtype_names[];
 #define        ENCTYPE_CNT             3
 
 #ifdef ENCRYPT_NAMES
-char *encrypt_names[] = {
+const char *encrypt_names[] = {
        "IS", "SUPPORT", "REPLY", "START", "END",
        "REQUEST-START", "REQUEST-END", "ENC-KEYID", "DEC-KEYID",
        0,
 };
-char *enctype_names[] = {
+const char *enctype_names[] = {
        "ANY", "DES_CFB64",  "DES_OFB64",  0,
 };
 #else