diff options
author | Evan Huus <eapache@gmail.com> | 2013-03-29 00:26:23 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-03-29 00:26:23 +0000 |
commit | 37600a157ba2036a79a5ebf466b31b8eee19244e (patch) | |
tree | 05b5db07655ce39ffe0c9c42c62d30a0c389b8df /epan/dissectors/packet-mpeg-pes.c | |
parent | 6f19d87f4e3aaa5872bdec1d9f4e50d85eee193d (diff) |
Rename value string (and similar) functions to use a consistent pattern. This
was done using textual search+replace, not anything syntax-aware, so presumably
it got most comments as well (except where there were typos).
Use a consistent coding style, and make proper use of the WS_DLL_* defines.
Group the functions appropriately in the header.
I ended up getting rid of most of the explanatory comments since many of them
duplicated what was in the value_string.c file (and were out of sync with the
recent updates I made to those in r48633). Presumably most of the comments
should be in the .h file not the .c file, but there's enough churn ahead that
it's not worth fixing yet.
Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8467
svn path=/trunk/; revision=48634
Diffstat (limited to 'epan/dissectors/packet-mpeg-pes.c')
-rw-r--r-- | epan/dissectors/packet-mpeg-pes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index af92a0de6e..93c97583d3 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -846,7 +846,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data stream = tvb_get_guint8(tvb, 3); if (check_col(pinfo->cinfo, COL_INFO)) { - const char *s = match_strval(stream, mpeg_pes_T_stream_vals); + const char *s = try_val_to_str(stream, mpeg_pes_T_stream_vals); if (s != NULL) col_set_str(pinfo->cinfo, COL_INFO, s); } @@ -864,7 +864,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data frame_type = tvb_get_guint8(tvb, 5) >> 3 & 0x07; if (check_col(pinfo->cinfo, COL_INFO)) { - const char *s = match_strval(frame_type, + const char *s = try_val_to_str(frame_type, mpeg_pes_T_frame_type_vals); if (s != NULL) col_set_str(pinfo->cinfo, COL_INFO, s); |