diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-16 23:35:58 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-16 23:35:58 +0000 |
| commit | 42d22cf0a3e6630a90e15f9f615d8d58c342a4af (patch) | |
| tree | 673d8f1013a490c04870a138a3f6dba2bc6871d2 /packet-giop.c | |
| parent | ce2e2cf78c745a2f2e588c31b87fd357c95aa4f8 (diff) | |
Do not use "match_strval()" unless you're prepared to check whether it
returns NULL and do something appropriate if it does so; instead, use
"val_to_str()", and let *it* worry about the value passed to it not
having a corresponding string.
svn path=/trunk/; revision=2908
Diffstat (limited to 'packet-giop.c')
| -rw-r--r-- | packet-giop.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/packet-giop.c b/packet-giop.c index 3eceaaa6c4..6e7bbc9440 100644 --- a/packet-giop.c +++ b/packet-giop.c @@ -4,7 +4,7 @@ * Laurent Deniel <deniel@worldnet.fr> * Craig Rodrigues <rodrigc@mediaone.net> * - * $Id: packet-giop.c,v 1.28 2001/01/09 06:31:35 guy Exp $ + * $Id: packet-giop.c,v 1.29 2001/01/16 23:35:58 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -647,13 +647,13 @@ dissect_giop_reply (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (check_col(pinfo->fd, COL_INFO)) { col_append_fstr(pinfo->fd, COL_INFO, ": %s", - match_strval(reply_status, reply_status_types)); + val_to_str(reply_status, reply_status_types, "Unknown (%u)")); } if (tree) { proto_tree_add_text (reply_tree, tvb, offset-4, 4, - "Reply status: %s", - match_strval(reply_status, reply_status_types)); + "Reply status: %s", + val_to_str(reply_status, reply_status_types, "Unknown (%u)")); } @@ -714,13 +714,13 @@ dissect_giop_reply_1_2 (tvbuff_t * tvb, packet_info * pinfo, if (check_col(pinfo->fd, COL_INFO)) { col_append_fstr(pinfo->fd, COL_INFO, ": %s", - match_strval(reply_status, reply_status_types)); + val_to_str(reply_status, reply_status_types, "Unknown (%u)")); } if (tree) { proto_tree_add_text (reply_tree, tvb, offset-4, 4, - "Reply status: %s", - match_strval(reply_status, reply_status_types)); + "Reply status: %s", + val_to_str(reply_status, reply_status_types, "Unknown (%u)")); } |