diff options
author | Bill Meier <wmeier@newsguy.com> | 2010-01-19 19:37:03 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2010-01-19 19:37:03 +0000 |
commit | e0064797fb53cb60feb32bdb316a902ccca6dd07 (patch) | |
tree | 4083fcbf1499c3b376b34133b76ef20e28e4fb58 /epan/ftypes/ftypes.c | |
parent | 2efa26e0e1b9f75189b7a4f05abe3990870d6fe9 (diff) | |
download | wireshark-e0064797fb53cb60feb32bdb316a902ccca6dd07.tar.gz |
Use more unique names for certain enum constants.
(enum constant names are part of the global name space).
(Fixes at least one gcc -Wshadow warning).
svn path=/trunk/; revision=31572
Diffstat (limited to 'epan/ftypes/ftypes.c')
-rw-r--r-- | epan/ftypes/ftypes.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/ftypes/ftypes.c b/epan/ftypes/ftypes.c index 49b1a20f27..0cd51aa692 100644 --- a/epan/ftypes/ftypes.c +++ b/epan/ftypes/ftypes.c @@ -354,21 +354,21 @@ slice_func(gpointer data, gpointer user_data) /* Check the end type and set the length */ - if (ending == TO_THE_END) { + if (ending == DRANGE_NODE_END_T_TO_THE_END) { length = field_length - start_offset; if (length <= 0) { slice_data->slice_failure = TRUE; return; } } - else if (ending == LENGTH) { + else if (ending == DRANGE_NODE_END_T_LENGTH) { length = drange_node_get_length(drnode); if (start_offset + length > (int) field_length) { slice_data->slice_failure = TRUE; return; } } - else if (ending == OFFSET) { + else if (ending == DRANGE_NODE_END_T_OFFSET) { end_offset = drange_node_get_end_offset(drnode); if (end_offset < 0) { end_offset = field_length + end_offset; |