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/dissectors/packet-aim.c | |
| parent | 2b07720c2fde93c0ee91e88969e76493ee7f86de (diff) | |
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/dissectors/packet-aim.c')
| -rw-r--r-- | epan/dissectors/packet-aim.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index 6bc69b7336..5d57c2b67a 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -666,7 +666,8 @@ static void dissect_aim_newconn(tvbuff_t *tvb, packet_info *pinfo, int dissect_aim_snac_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aim_tree) { - char *name; + const char *name; + if ((name = match_strval(tvb_get_ntohs(tvb, 0), aim_snac_errors)) != NULL) { if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, name); @@ -681,12 +682,12 @@ int dissect_aim_snac_error(tvbuff_t *tvb, packet_info *pinfo, int dissect_aim_userinfo(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree) { - offset = dissect_aim_buddyname(tvb, pinfo, offset, tree); + offset = dissect_aim_buddyname(tvb, pinfo, offset, tree); proto_tree_add_item(tree, hf_aim_userinfo_warninglevel, tvb, offset, 2, FALSE); offset += 2; - return dissect_aim_tlv_list(tvb, pinfo, offset, tree, onlinebuddy_tlvs); + return dissect_aim_tlv_list(tvb, pinfo, offset, tree, onlinebuddy_tlvs); } int dissect_aim_fnac_flags(tvbuff_t *tvb, int offset, int len, proto_item *ti, guint16 flags) |