osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Remove #defines that provided backward source compatibility 

for deprecated dissector add/remmove/... functions.

svn path=/trunk/; revision=45000
This commit is contained in:
Jörg Mayer 2012-09-19 07:20:49 +00:00
parent bce733e4d8
commit 30b7b74dde
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
epan/packet.h
View File

@ -173,64 +173,36 @@ extern int get_dissector_table_base(const char *name);
extern void dissector_add_uint(const char *abbrev, const guint32 pattern,
dissector_handle_t handle);
/* For old code that hasn't yet been changed. */
#define dissector_add(abbrev, pattern, handle) \
dissector_add_uint(abbrev, pattern, handle)
/* Delete the entry for a dissector in a uint dissector table
with a particular pattern. */
extern void dissector_delete_uint(const char *name, const guint32 pattern,
dissector_handle_t handle);
/* For old code that hasn't yet been changed. */
#define dissector_delete(name, pattern, handle) \
dissector_delete_uint(name, pattern, handle)
/* Change the entry for a dissector in a uint dissector table
with a particular pattern to use a new dissector handle. */
extern void dissector_change_uint(const char *abbrev, const guint32 pattern,
dissector_handle_t handle);
/* For old code that hasn't yet been changed. */
#define dissector_change(abbrev, pattern, handle) \
dissector_change_uint(abbrev, pattern, handle)
/* Reset an entry in a uint dissector table to its initial value. */
extern void dissector_reset_uint(const char *name, const guint32 pattern);
/* For old code that hasn't yet been changed. */
#define dissector_reset(name, pattern) \
dissector_reset_uint(name, pattern)
/* Look for a given value in a given uint dissector table and, if found,
call the dissector with the arguments supplied, and return TRUE,
otherwise return FALSE. */
extern gboolean dissector_try_uint(dissector_table_t sub_dissectors,
const guint32 uint_val, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
/* For old code that hasn't yet been changed. */
#define dissector_try_port(sub_dissectors, uint_val, tvb, pinfo, tree) \
dissector_try_uint(sub_dissectors, uint_val, tvb, pinfo, tree)
/* Look for a given value in a given uint dissector table and, if found,
call the dissector with the arguments supplied, and return TRUE,
otherwise return FALSE. */
extern gboolean dissector_try_uint_new(dissector_table_t sub_dissectors,
const guint32 uint_val, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, const gboolean add_proto_name, void *data);
/* For old code that hasn't yet been changed. */
#define dissector_try_port_new(sub_dissectors, uint_val, tvb, pinfo, tree, add_proto_name) \
dissector_try_uint_new(sub_dissectors, uint_val, tvb, pinfo, tree, add_proto_name, NULL)
/* Look for a given value in a given uint dissector table and, if found,
return the dissector handle for that value. */
extern dissector_handle_t dissector_get_uint_handle(
dissector_table_t const sub_dissectors, const guint32 uint_val);
/* For old code that hasn't yet been changed. */
#define dissector_get_port_handle(sub_dissectors, uint_val) \
dissector_get_uint_handle(sub_dissectors, uint_val)
/* Add an entry to a string dissector table. */
extern void dissector_add_string(const char *name, const gchar *pattern,
dissector_handle_t handle);

7
tools/checkAPIs.pl
View File

@ -128,13 +128,6 @@ my %APIs = (
'perror', # Use g_strerror() and report messages in whatever
# fashion is appropriate for the code in question.
'ctime', # Use abs_time_secs_to_str()
'dissector_add', # Use dissector_add_uint()
'dissector_change', # Use dissector_change_uint()
'dissector_delete', # Use dissector_delete_uint()
'dissector_get_port_handle', # Use dissector_get_uint_handle()
'dissector_reset', # Use dissector_reset_uint()
'dissector_try_port', # Use dissector_try_uint()
'dissector_try_port_new', # Use dissector_try_uint_new()
'next_tvb_add_port', # Use next_tvb_add_uint() (and a matching change
# of NTVB_PORT -> NTVB_UINT)