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 /plugins | |
| parent | 6f19d87f4e3aaa5872bdec1d9f4e50d85eee193d (diff) | |
| download | wireshark-37600a157ba2036a79a5ebf466b31b8eee19244e.tar.gz wireshark-37600a157ba2036a79a5ebf466b31b8eee19244e.tar.bz2 wireshark-37600a157ba2036a79a5ebf466b31b8eee19244e.zip | |
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 'plugins')
| -rw-r--r-- | plugins/ethercat/packet-ethercat-datagram.c | 2 | ||||
| -rw-r--r-- | plugins/gryphon/packet-gryphon.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c index 68908e8c78..9299f47417 100644 --- a/plugins/ethercat/packet-ethercat-datagram.c +++ b/plugins/ethercat/packet-ethercat-datagram.c @@ -386,7 +386,7 @@ static void EcSummaryFormater(guint32 datalength, tvbuff_t *tvb, gint offset, ch static void EcCmdFormatter(guint8 cmd, char *szText, gint nMax) { gint idx=0; - const gchar *szCmd = match_strval_idx((guint32)cmd, EcCmdLong, &idx); + const gchar *szCmd = try_val_to_str_idx((guint32)cmd, EcCmdLong, &idx); if ( idx != -1 ) g_snprintf(szText, nMax, "Cmd : %d (%s)", cmd, szCmd); diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c index d1bc014ca1..70c0a4bc40 100644 --- a/plugins/gryphon/packet-gryphon.c +++ b/plugins/gryphon/packet-gryphon.c @@ -816,7 +816,7 @@ dissect_gryphon_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree == NULL) return; - if (match_strval(frmtyp, frame_type) == NULL) { + if (try_val_to_str(frmtyp, frame_type) == NULL) { /* * Unknown message type. */ |