diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-06-26 19:56:52 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-06-26 19:56:52 +0000 |
| commit | ab797734ddebd50f40deae437f27392ca4651c92 (patch) | |
| tree | 82a95df0652f9df59634fd7a7f8dd36026fa4ea7 /epan/xdlc.c | |
| parent | 2b07720c2fde93c0ee91e88969e76493ee7f86de (diff) | |
| download | wireshark-ab797734ddebd50f40deae437f27392ca4651c92.tar.gz wireshark-ab797734ddebd50f40deae437f27392ca4651c92.tar.bz2 wireshark-ab797734ddebd50f40deae437f27392ca4651c92.zip | |
Get rid of the private "my_match_strval()" routine in many dissectors;
add a "match_strval_idx()" routine that does the same thing, and have
"match_strval()" call it.
Make those routines, and "val_to_str()", return a "const" pointer.
Update dissectors as necessary to squelch compiler warnings produced by
that.
Use "val_to_str()" rather than using "match_strval()" and then, if the
result is null, substituting a specific string. Clean up some other
"match_strval()"/"val_to_str()" usages.
Add a null pointer check in the NDPS dissector's "attribute_value()"
routine, as it's not clear that "global_attribute_name" won't be null at
that point.
Make some global variables in the AFS4INT dissector local.
Make some routines not used outside the module they're in static.
Make some tables "static const".
Clean up white space.
Fix Gerald's address in some files.
svn path=/trunk/; revision=14786
Diffstat (limited to 'epan/xdlc.c')
| -rw-r--r-- | epan/xdlc.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/epan/xdlc.c b/epan/xdlc.c index 1cef001f9c..f631475303 100644 --- a/epan/xdlc.c +++ b/epan/xdlc.c @@ -185,7 +185,7 @@ dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo, char info[80]; proto_tree *tc, *control_tree; gchar *frame_type = NULL; - gchar *modifier; + const gchar *modifier; switch (tvb_get_guint8(tvb, offset) & 0x03) { @@ -285,14 +285,12 @@ dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo, cf_items = cf_items_nonext; control_format = "Control field: %s (0x%02X)"; if (is_response) { - modifier = match_strval(control & XDLC_U_MODIFIER_MASK, - u_modifier_short_vals_resp); + modifier = val_to_str(control & XDLC_U_MODIFIER_MASK, + u_modifier_short_vals_resp, "Unknown"); } else { - modifier = match_strval(control & XDLC_U_MODIFIER_MASK, - u_modifier_short_vals_cmd); + modifier = val_to_str(control & XDLC_U_MODIFIER_MASK, + u_modifier_short_vals_cmd, "Unknown"); } - if (modifier == NULL) - modifier = "Unknown"; poll_final = (control & XDLC_P_F); sprintf(info, "U%s, func=%s", (poll_final ? |