diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-05-17 18:58:40 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-05-17 18:58:40 +0000 |
| commit | 18c12d416e8d7aaf10391da6979948e50e05e8da (patch) | |
| tree | 238df2bb8c8d79159022e40db54ba7e738f3f94f /epan/dissectors/packet-rpc.c | |
| parent | fa333ffbae4b4a6693330a969fce5d0b27efd68d (diff) | |
As suggested by Chris: use val_to_str_const() instead of match_strval() plus a
NULL-return check.
Use val_to_str_const instead of val_to_str() in a couple places where the string
is constant.
Use val_to_str() instead of blindly passing the return value from match_strval()
into a format routine (to ensure a non-NULL string pointer). A couple of these
were cases where it could not actually return NULL, but I changed it for
consistency.
Store the return value of match_strval() rather than calling it repeatedly.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37204 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-rpc.c')
| -rw-r--r-- | epan/dissectors/packet-rpc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index d1085758b8..7435a7fdbe 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -2242,13 +2242,9 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * AUTH_GSSAPI procname. */ if (flavor == FLAVOR_AUTHGSSAPI_MSG) { - procname = (char *)match_strval(gss_proc, rpc_authgssapi_proc); + procname = (char *)val_to_str_const(gss_proc, rpc_authgssapi_proc, "(null)"); } - /* Don't pass NULL string pointers to the format routines below */ - if (!procname) - procname = "(null)"; - rpc_prog_key.prog = prog; if ((rpc_prog = g_hash_table_lookup(rpc_progs,&rpc_prog_key)) == NULL) { proto = NULL; |