diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-01-18 09:55:10 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-01-18 09:55:10 +0000 |
commit | 813e00d6a53f2c2ac8e1189ff732cab62ce6a098 (patch) | |
tree | b2c9b34395d68e2dd3384b1b81ef205dbb9c3352 | |
parent | bd19f14df588ce8277d03685fe113ba3258d5d9c (diff) |
Fix comments to reflect what a null function pointer in a "vsff" table
really means.
Make the "XXX_proc" arrays static.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2920 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | packet-bootparams.c | 6 | ||||
-rw-r--r-- | packet-mount.c | 4 | ||||
-rw-r--r-- | packet-nfs.c | 12 | ||||
-rw-r--r-- | packet-portmap.c | 12 | ||||
-rw-r--r-- | packet-stat.c | 6 | ||||
-rw-r--r-- | packet-ypbind.c | 10 | ||||
-rw-r--r-- | packet-ypserv.c | 8 | ||||
-rw-r--r-- | packet-ypxfr.c | 12 |
8 files changed, 35 insertions, 35 deletions
diff --git a/packet-bootparams.c b/packet-bootparams.c index d6d9b20c83..9ecbb1791e 100644 --- a/packet-bootparams.c +++ b/packet-bootparams.c @@ -1,7 +1,7 @@ /* packet-bootparams.c * Routines for bootparams dissection * - * $Id: packet-bootparams.c,v 1.14 2001/01/03 06:55:27 guy Exp $ + * $Id: packet-bootparams.c,v 1.15 2001/01/18 09:55:09 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -139,8 +139,8 @@ int dissect_whoami_reply(const u_char *pd, int offset, frame_data *fd, } /* proc number, "proc name", dissect_request, dissect_reply */ -/* NULL as function pointer means: take the generic one. */ -const vsff bootparams1_proc[] = { +/* NULL as function pointer means: type of arguments is "void". */ +static const vsff bootparams1_proc[] = { { BOOTPARAMSPROC_NULL, "NULL", NULL, NULL }, { BOOTPARAMSPROC_WHOAMI, "WHOAMI", diff --git a/packet-mount.c b/packet-mount.c index 2369b52062..4a8193a647 100644 --- a/packet-mount.c +++ b/packet-mount.c @@ -1,7 +1,7 @@ /* packet-mount.c * Routines for mount dissection * - * $Id: packet-mount.c,v 1.18 2001/01/03 06:55:30 guy Exp $ + * $Id: packet-mount.c,v 1.19 2001/01/18 09:55:09 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -436,7 +436,7 @@ dissect_mount_pathconf_reply(const u_char *pd, int offset, frame_data *fd, } /* proc number, "proc name", dissect_request, dissect_reply */ -/* NULL as function pointer means: take the generic one. */ +/* NULL as function pointer means: type of arguments is "void". */ /* Mount protocol version 1, RFC 1094 */ static const vsff mount1_proc[] = { diff --git a/packet-nfs.c b/packet-nfs.c index 27c925e7bd..5c3f183035 100644 --- a/packet-nfs.c +++ b/packet-nfs.c @@ -3,7 +3,7 @@ * Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de> * Copyright 2000, Mike Frisch <frisch@hummingbird.com> (NFSv4 decoding) * - * $Id: packet-nfs.c,v 1.41 2001/01/03 16:41:06 gram Exp $ + * $Id: packet-nfs.c,v 1.42 2001/01/18 09:55:09 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -1386,8 +1386,8 @@ dissect_nfs2_statfs_reply(const u_char* pd, int offset, frame_data* fd, proto_tr /* proc number, "proc name", dissect_request, dissect_reply */ -/* NULL as function pointer means: take the generic one. */ -const vsff nfs2_proc[] = { +/* NULL as function pointer means: type of arguments is "void". */ +static const vsff nfs2_proc[] = { { 0, "NULL", /* OK */ NULL, NULL }, { 1, "GETATTR", /* OK */ @@ -4924,8 +4924,8 @@ dissect_nfs4_compound_reply(const u_char* pd, int offset, frame_data* fd, /* proc number, "proc name", dissect_request, dissect_reply */ -/* NULL as function pointer means: take the generic one. */ -const vsff nfs3_proc[] = { +/* NULL as function pointer means: type of arguments is "void". */ +static const vsff nfs3_proc[] = { { 0, "NULL", /* OK */ NULL, NULL }, { 1, "GETATTR", /* OK */ @@ -4974,7 +4974,7 @@ const vsff nfs3_proc[] = { }; /* end of NFS Version 3 */ -const vsff nfs4_proc[] = { +static const vsff nfs4_proc[] = { { 0, "NULL", NULL, NULL }, { 1, "COMPOUND", diff --git a/packet-portmap.c b/packet-portmap.c index 800621f2ac..d611bbf797 100644 --- a/packet-portmap.c +++ b/packet-portmap.c @@ -1,7 +1,7 @@ /* packet-portmap.c * Routines for portmap dissection * - * $Id: packet-portmap.c,v 1.21 2001/01/03 06:55:31 guy Exp $ + * $Id: packet-portmap.c,v 1.22 2001/01/18 09:55:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -221,8 +221,8 @@ int dissect_dump_reply(const u_char *pd, int offset, frame_data *fd, } /* proc number, "proc name", dissect_request, dissect_reply */ -/* NULL as function pointer means: take the generic one. */ -const vsff portmap1_proc[] = { +/* NULL as function pointer means: type of arguments is "void". */ +static const vsff portmap1_proc[] = { { PORTMAPPROC_NULL, "NULL", NULL, NULL }, { PORTMAPPROC_SET, "SET", NULL, NULL }, { PORTMAPPROC_UNSET, "UNSET", NULL, NULL }, @@ -233,7 +233,7 @@ const vsff portmap1_proc[] = { }; /* end of Portmap version 1 */ -const vsff portmap2_proc[] = { +static const vsff portmap2_proc[] = { { PORTMAPPROC_NULL, "NULL", NULL, NULL }, { PORTMAPPROC_SET, "SET", @@ -327,7 +327,7 @@ int dissect_rpcb3_dump_reply(const u_char *pd, int offset, frame_data *fd, /* Portmapper version 3, RFC 1833, Page 7 */ -const vsff portmap3_proc[] = { +static const vsff portmap3_proc[] = { { RPCBPROC_NULL, "NULL", NULL, NULL }, { RPCBPROC_SET, "SET", @@ -352,7 +352,7 @@ const vsff portmap3_proc[] = { /* Portmapper version 4, RFC 1833, Page 8 */ -const vsff portmap4_proc[] = { +static const vsff portmap4_proc[] = { { RPCBPROC_NULL, "NULL", NULL, NULL }, { RPCBPROC_SET, "SET", diff --git a/packet-stat.c b/packet-stat.c index 58f66eb8d1..8de36f8e15 100644 --- a/packet-stat.c +++ b/packet-stat.c @@ -1,7 +1,7 @@ /* packet-stat.c * Routines for stat dissection * - * $Id: packet-stat.c,v 1.6 2001/01/03 06:55:33 guy Exp $ + * $Id: packet-stat.c,v 1.7 2001/01/18 09:55:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -41,9 +41,9 @@ static int proto_stat = -1; static gint ett_stat = -1; /* proc number, "proc name", dissect_request, dissect_reply */ -/* NULL as function pointer means: take the generic one. */ +/* NULL as function pointer means: type of arguments is "void". */ -const vsff stat_proc[] = { +static const vsff stat_proc[] = { { 0, "NULL", NULL, NULL }, { STATPROC_STAT, "STAT", NULL, NULL }, diff --git a/packet-ypbind.c b/packet-ypbind.c index 9ee4fb1ec7..25ef94f918 100644 --- a/packet-ypbind.c +++ b/packet-ypbind.c @@ -1,7 +1,7 @@ /* packet-ypbind.c * Routines for ypbind dissection * - * $Id: packet-ypbind.c,v 1.6 2001/01/03 06:55:34 guy Exp $ + * $Id: packet-ypbind.c,v 1.7 2001/01/18 09:55:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -42,8 +42,8 @@ static int proto_ypbind = -1; static gint ett_ypbind = -1; /* proc number, "proc name", dissect_request, dissect_reply */ -/* NULL as function pointer means: take the generic one. */ -const vsff ypbind1_proc[] = { +/* NULL as function pointer means: type of arguments is "void". */ +static const vsff ypbind1_proc[] = { { YPBINDPROC_NULL, "NULL", NULL, NULL }, { YPBINDPROC_DOMAIN, "DOMAIN", NULL, NULL }, { YPBINDPROC_SETDOM, "SETDOMAIN", NULL, NULL }, @@ -51,11 +51,11 @@ const vsff ypbind1_proc[] = { }; /* end of YPBind version 1 */ -const vsff ypbind2_proc[] = { +static const vsff ypbind2_proc[] = { { YPBINDPROC_NULL, "NULL", NULL, NULL }, { YPBINDPROC_DOMAIN, "DOMAIN", NULL, NULL }, { YPBINDPROC_SETDOM, "SETDOMAIN", NULL, NULL }, - { 0, NULL, NULL, NULL } + { 0, NULL, NULL, NULL } }; /* end of YPBind version 2 */ diff --git a/packet-ypserv.c b/packet-ypserv.c index 7401fcaef6..5a478a5657 100644 --- a/packet-ypserv.c +++ b/packet-ypserv.c @@ -1,7 +1,7 @@ /* packet-ypserv.c * Routines for ypserv dissection * - * $Id: packet-ypserv.c,v 1.12 2001/01/03 06:55:34 guy Exp $ + * $Id: packet-ypserv.c,v 1.13 2001/01/18 09:55:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -150,10 +150,10 @@ int dissect_firstnext_reply(const u_char *pd, int offset, frame_data *fd, /* proc number, "proc name", dissect_request, dissect_reply */ -/* NULL as function pointer means: take the generic one. */ +/* NULL as function pointer means: type of arguments is "void". */ /* someone please get me a version 1 trace */ -const vsff ypserv1_proc[] = { +static const vsff ypserv1_proc[] = { { 0, "NULL", NULL, NULL }, { YPPROC_ALL, "ALL", NULL, NULL }, @@ -181,7 +181,7 @@ const vsff ypserv1_proc[] = { }; /* end of YPServ version 2 */ -const vsff ypserv2_proc[] = { +static const vsff ypserv2_proc[] = { { 0, "NULL", NULL, NULL }, { YPPROC_ALL, "ALL", NULL, NULL }, diff --git a/packet-ypxfr.c b/packet-ypxfr.c index 5ca5a7c714..13f7f01ba8 100644 --- a/packet-ypxfr.c +++ b/packet-ypxfr.c @@ -1,7 +1,7 @@ /* packet-ypxfr.c * Routines for ypxfr dissection * - * $Id: packet-ypxfr.c,v 1.5 2001/01/03 06:55:34 guy Exp $ + * $Id: packet-ypxfr.c,v 1.6 2001/01/18 09:55:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -42,11 +42,11 @@ static int proto_ypxfr = -1; static gint ett_ypxfr = -1; /* proc number, "proc name", dissect_request, dissect_reply */ -/* NULL as function pointer means: take the generic one. */ -const vsff ypxfr1_proc[] = { - { YPXFRPROC_NULL, "NULL", NULL, NULL }, - { YPXFRPROC_GETMAP, "GETMAP", NULL, NULL }, - { 0, NULL, NULL, NULL } +/* NULL as function pointer means: type of arguments is "void". */ +static const vsff ypxfr1_proc[] = { + { YPXFRPROC_NULL, "NULL", NULL, NULL }, + { YPXFRPROC_GETMAP, "GETMAP", NULL, NULL }, + { 0, NULL, NULL, NULL } }; /* end of YPXFR version 1 */ |