Thou shalt not use C++-style comments in C code, for they upset some C

compilers.

svn path=/trunk/; revision=4284

diff --git a/packet-diameter.c b/packet-diameter.c
index 3b3201ffa6dbf1ce264e4f143ab2c65862df18e7..7108ca18389e99de5440d7284ce32bc4579f055a 100644 (file)
--- a/packet-diameter.c
+++ b/packet-diameter.c
@@ -1,7 +1,7 @@
 /* packet-diameter.c
  * Routines for Diameter packet disassembly
  *
- * $Id: packet-diameter.c,v 1.34 2001/11/21 02:01:06 guy Exp $
+ * $Id: packet-diameter.c,v 1.35 2001/11/27 07:41:39 guy Exp $
  *
  * Copyright (c) 2001 by David Frascone <dave@frascone.com>
  *
@@ -1369,7 +1369,7 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree
                                " resFl=0x%x",
                                flags, AVP_FLAGS_RESERVED);
          /* For now, don't set bad packet, since I'm accidentally setting a wrong bit */
-         // BadPacket = TRUE;
+         /* BadPacket = TRUE; */
        }
                
        /*

diff --git a/packet-nfs.c b/packet-nfs.c
index 20acce68f91b6c5f9978957aca3316a3110af8aa..e94e14db8ecd988a49eb95381dfdd218f661e372 100644 (file)
--- a/packet-nfs.c
+++ b/packet-nfs.c
@@ -3,7 +3,7 @@
  * Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
  * Copyright 2000-2001, Mike Frisch <frisch@hummingbird.com> (NFSv4 decoding)
  *
- * $Id: packet-nfs.c,v 1.59 2001/10/29 21:13:07 guy Exp $
+ * $Id: packet-nfs.c,v 1.60 2001/11/27 07:41:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -4992,7 +4992,7 @@ dissect_nfs_dirlist4(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
        while (nextentry)
        {
-               // offset = dissect_nfs_cookie4(tvb, offset, pinfo, newftree);
+               /* offset = dissect_nfs_cookie4(tvb, offset, pinfo, newftree); */
                offset = dissect_rpc_uint64(tvb, pinfo, newftree, hf_nfs_cookie4, offset);
                offset = dissect_nfs_component4(tvb, offset, pinfo, newftree, "name");
                offset = dissect_nfs_fattr4(tvb, offset, pinfo, newftree, "attrs");

diff --git a/packet-socks.c b/packet-socks.c
index 4a31977a9cb54be4f9549caa769867fc68e4efa0..a4578c1a92d85c1d1f2530d95414c98a5d0f66fd 100644 (file)
--- a/packet-socks.c
+++ b/packet-socks.c
@@ -2,7 +2,7 @@
  * Routines for socks versions 4 &5  packet dissection
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * $Id: packet-socks.c,v 1.29 2001/11/27 07:13:26 guy Exp $
+ * $Id: packet-socks.c,v 1.30 2001/11/27 07:41:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -977,7 +977,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
                if ( hash_info->command == TRACERT_COMMAND)
                        col_append_str(pinfo->fd, COL_INFO, ", Traceroute Req");
                
-//XX           if ( hash_info->port != -1)
+/*XXX          if ( hash_info->port != -1) */
                if ( hash_info->port != 0)
                        col_append_fstr(pinfo->fd, COL_INFO, ", Remote Port: %d",
                                hash_info->port);