diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-02-02 09:02:11 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-02-02 09:02:11 +0000 |
| commit | f78791d7d2a60c356da02c3525f2a195582717dc (patch) | |
| tree | 77655121da36db0380be49b4d5591e23cf65a148 /epan/proto.c | |
| parent | bf12f288dbd64bf259261d9691962f116e220cec (diff) | |
Revert changes committed by error in r47433
svn path=/trunk/; revision=47442
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/epan/proto.c b/epan/proto.c index d6adc83c7a..2f09322634 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -5098,52 +5098,6 @@ tmp_fld_check_assert(header_field_info *hfinfo) } } -/*static enum ftenum -_ftype_common(enum ftenum type) -{ - switch (type) { - case FT_INT8: - case FT_INT16: - case FT_INT24: - case FT_INT32: - return FT_INT32; - - case FT_UINT8: - case FT_UINT16: - case FT_UINT24: - case FT_UINT32: - case FT_IPXNET: - case FT_FRAMENUM: - return FT_UINT32; - - case FT_UINT64: - case FT_EUI64: - return FT_UINT64; - - case FT_STRING: - case FT_STRINGZ: - case FT_UINT_STRING: - return FT_STRING; - - case FT_FLOAT: - case FT_DOUBLE: - return FT_DOUBLE; - - case FT_BYTES: - case FT_UINT_BYTES: - case FT_ETHER: - case FT_OID: - return FT_BYTES; - - case FT_ABSOLUTE_TIME: - case FT_RELATIVE_TIME: - return FT_ABSOLUTE_TIME; - - default: - return type; - } -}*/ - #define PROTO_PRE_ALLOC_HF_FIELDS_MEM 120000 static int proto_register_field_init(header_field_info *hfinfo, const int parent) @@ -5221,12 +5175,6 @@ proto_register_field_init(header_field_info *hfinfo, const int parent) same_name_hfinfo->same_name_next = hfinfo; hfinfo->same_name_prev = same_name_hfinfo; - - /*while (same_name_hfinfo) { - if (_ftype_common(hfinfo->type) != _ftype_common(same_name_hfinfo->type)) - fprintf(stderr, "'%s' exists multiple times with NOT compatible types: %s and %s\n", hfinfo->abbrev, ftype_name(hfinfo->type), ftype_name(same_name_hfinfo->type)); - same_name_hfinfo = same_name_hfinfo->same_name_prev; - }*/ } } |