diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-07-29 03:49:23 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-07-29 03:49:23 +0000 |
| commit | 70fb0178665e945fe77d233ca8e59133a310a8d4 (patch) | |
| tree | b18fa6cfc76e83780a2ee7e27201457e69477362 | |
| parent | 8a44823f030d6582d2b988055dc9ae5fed32aaf0 (diff) | |
Constify some variables, functions, and structure members to squelch
compiler warnings.
svn path=/trunk/; revision=15138
| -rw-r--r-- | epan/dissectors/packet-rpc.c | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-rpc.h | 4 | ||||
| -rw-r--r-- | tap-rpcstat.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 9999b35750..2c3f272b0a 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -333,11 +333,12 @@ rpc_init_proc_table(guint prog, guint vers, const vsff *proc_table, /* return the name associated with a previously registered procedure. */ -char *rpc_proc_name(guint32 prog, guint32 vers, guint32 proc) +const char * +rpc_proc_name(guint32 prog, guint32 vers, guint32 proc) { rpc_proc_info_key key; rpc_proc_info_value *value; - char *procname; + const char *procname; static char procname_static[20]; key.prog = prog; @@ -1495,7 +1496,7 @@ dissect_rpc_indir_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, static address null_address = { AT_NONE, 0, NULL }; rpc_call_info_key rpc_call_key; rpc_call_info_value *rpc_call; - char *procname = NULL; + const char *procname = NULL; char procname_static[20]; dissect_function_t *dissect_function = NULL; diff --git a/epan/dissectors/packet-rpc.h b/epan/dissectors/packet-rpc.h index 1a8c06ab15..e5bf566199 100644 --- a/epan/dissectors/packet-rpc.h +++ b/epan/dissectors/packet-rpc.h @@ -121,7 +121,7 @@ extern void rpc_init_proc_table(guint prog, guint vers, const vsff *proc_table, int procedure_hf); extern void rpc_init_prog(int proto, guint32 prog, int ett); extern const char *rpc_prog_name(guint32 prog); -extern char *rpc_proc_name(guint32 prog, guint32 vers, guint32 proc); +extern const char *rpc_proc_name(guint32 prog, guint32 vers, guint32 proc); extern int rpc_prog_hf(guint32 prog, guint32 vers); extern unsigned int rpc_roundup(unsigned int a); @@ -183,7 +183,7 @@ typedef struct _rpc_proc_info_key { } rpc_proc_info_key; typedef struct _rpc_proc_info_value { - gchar *name; + const gchar *name; dissect_function_t *dissect_call; dissect_function_t *dissect_reply; } rpc_proc_info_value; diff --git a/tap-rpcstat.c b/tap-rpcstat.c index c0981a3a31..ec178440dc 100644 --- a/tap-rpcstat.c +++ b/tap-rpcstat.c @@ -46,7 +46,7 @@ /* used to keep track of statistics for a specific procedure */ typedef struct _rpc_procedure_t { - char *proc; + const char *proc; int num; nstime_t min; nstime_t max; |