diff options
author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-30 14:02:49 +0000 |
---|---|---|
committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-30 14:02:49 +0000 |
commit | 5403869e2ec79fc81d8996c0249c6fda00105c5e (patch) | |
tree | d68eff5047dee44c66c08450cc961d81b2fc9f04 /epan/proto.h | |
parent | 03c1008eca23fa0309a56656e4cfed6d31291d7d (diff) |
Rename hfinfo.ref_count to hfinfo.ref_type since that's now how it's used.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30216 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/proto.h')
-rw-r--r-- | epan/proto.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/epan/proto.h b/epan/proto.h index 4c4c8cfbf2..5c1e8e7ab0 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -173,22 +173,22 @@ typedef struct _header_field_info header_field_info; /** information describing a header field */ struct _header_field_info { /* ---------- set by dissector --------- */ - const char *name; /**< full name of this field */ - const char *abbrev; /**< abbreviated name of this field */ - enum ftenum type; /**< field type, one of FT_ (from ftypes.h) */ - int display; /**< one of BASE_, or number of field bits for FT_BOOLEAN */ - const void *strings; /**< value_string, range_string or true_false_string, - typically converted by VALS(), RVALS() or TFS(). - If this is an FT_PROTOCOL then it points to the - associated protocol_t structure */ - guint32 bitmask; /**< bitmask of interesting bits */ - const char *blurb; /**< Brief description of field */ + const char *name; /**< full name of this field */ + const char *abbrev; /**< abbreviated name of this field */ + enum ftenum type; /**< field type, one of FT_ (from ftypes.h) */ + int display; /**< one of BASE_, or number of field bits for FT_BOOLEAN */ + const void *strings; /**< value_string, range_string or true_false_string, + typically converted by VALS(), RVALS() or TFS(). + If this is an FT_PROTOCOL then it points to the + associated protocol_t structure */ + guint32 bitmask; /**< bitmask of interesting bits */ + const char *blurb; /**< Brief description of field */ /* ------- set by proto routines (prefilled by HFILL macro, see below) ------ */ - int id; /**< Field ID */ - int parent; /**< parent protocol tree */ - hf_ref_type ref_count; /**< is this field referenced by a filter */ - int bitshift; /**< bits to shift */ + int id; /**< Field ID */ + int parent; /**< parent protocol tree */ + hf_ref_type ref_type; /**< is this field referenced by a filter */ + int bitshift; /**< bits to shift */ header_field_info *same_name_next; /**< Link to next hfinfo with same abbrev */ header_field_info *same_name_prev; /**< Link to previous hfinfo with same abbrev */ }; @@ -202,8 +202,8 @@ struct _header_field_info { /** Used when registering many fields at once, using proto_register_field_array() */ typedef struct hf_register_info { - int *p_id; /**< written to by register() function */ - header_field_info hfinfo; /**< the field info to be registered */ + int *p_id; /**< written to by register() function */ + header_field_info hfinfo; /**< the field info to be registered */ } hf_register_info; @@ -217,16 +217,16 @@ typedef struct _item_label_t { /** Contains the field information for the proto_item. */ typedef struct field_info { - header_field_info *hfinfo; /**< pointer to registered field information */ - gint start; /**< current start of data in field_info.ds_tvb */ - gint length; /**< current data length of item in field_info.ds_tvb */ - gint appendix_start; /**< start of appendix data */ - gint appendix_length; /**< length of appendix data */ - gint tree_type; /**< one of ETT_ or -1 */ - item_label_t *rep; /**< string for GUI tree */ - guint32 flags; /**< bitfield like FI_GENERATED, ... */ - tvbuff_t *ds_tvb; /**< data source tvbuff */ - fvalue_t value; + header_field_info *hfinfo; /**< pointer to registered field information */ + gint start; /**< current start of data in field_info.ds_tvb */ + gint length; /**< current data length of item in field_info.ds_tvb */ + gint appendix_start; /**< start of appendix data */ + gint appendix_length; /**< length of appendix data */ + gint tree_type; /**< one of ETT_ or -1 */ + item_label_t *rep; /**< string for GUI tree */ + guint32 flags; /**< bitfield like FI_GENERATED, ... */ + tvbuff_t *ds_tvb; /**< data source tvbuff */ + fvalue_t value; } field_info; |