diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-06-02 01:29:42 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-06-02 08:30:16 +0000 |
| commit | 974f985bd9716cf8d0144099bd7c052f866c1a2b (patch) | |
| tree | 467001d4535c2ef1f9c4140f76ef1d63ae21d534 /epan | |
| parent | 10e59dba2b1ee123b4fdfbee288b486471cc68e0 (diff) | |
| download | wireshark-974f985bd9716cf8d0144099bd7c052f866c1a2b.tar.gz | |
Add SUBOBJECT_INITIALIZER and use it.
Just as we have OD_ENTRY_INITIALIZER, add SUBOBJECT_INITIALIZER, and use
it rather than memset().
Whether removing initializer warnings is a Good Thing is subject to
debate; remove a comment that implies it's been deemed a Good Thing.
Change-Id: Ife658d8bb1d4868789ca3b929aff6e4fccecb430
Reviewed-on: https://code.wireshark.org/review/21892
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-epl-profile-parser.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-epl.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-epl.h | 1 | ||||
| -rw-r--r-- | epan/range.h | 1 |
4 files changed, 4 insertions, 7 deletions
diff --git a/epan/dissectors/packet-epl-profile-parser.c b/epan/dissectors/packet-epl-profile-parser.c index 65eadcb2cf..694e4bbaa3 100644 --- a/epan/dissectors/packet-epl-profile-parser.c +++ b/epan/dissectors/packet-epl-profile-parser.c @@ -282,9 +282,7 @@ epl_eds_load(struct profile *profile, const char *eds_file) } else { /* Object already there, let's add subindices */ - struct subobject subobj; - - memset(&subobj, 0, sizeof subobj); + struct subobject subobj = SUBOBJECT_INITIALIZER; if (!obj->subindices) { @@ -555,9 +553,7 @@ populate_object_list(xmlNodeSetPtr nodes, void *_profile) if (tmpobj.type_class == OD_ENTRY_ARRAY || tmpobj.type_class == OD_ENTRY_RECORD) { xmlNode *subcur; - struct subobject subobj; - - memset(&subobj, 0, sizeof subobj); + struct subobject subobj = SUBOBJECT_INITIALIZER; obj->subindices = epl_wmem_iarray_new(profile->scope, sizeof (struct subobject), subobject_equal); diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 00bab8b874..589ea7d71c 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -1333,7 +1333,6 @@ struct object_mapping { const char *index_name; const char *title; }; -/* XXX hopefully temporary till -Wmissing-field-initializers and -Wmissing-braces are ignored */ #define OBJECT_MAPPING_INITIALIZER { { 0, 0 }, { 0, 0 }, 0, 0, 0, { 0, 0 }, 0, 0, 0 } #define CONVO_FOR_RESPONSE 1 diff --git a/epan/dissectors/packet-epl.h b/epan/dissectors/packet-epl.h index 42428e175b..b5f9769946 100644 --- a/epan/dissectors/packet-epl.h +++ b/epan/dissectors/packet-epl.h @@ -77,6 +77,7 @@ struct subobject { range_admin_t range; struct od_entry info; }; +#define SUBOBJECT_INITIALIZER { RANGE_ADMIN_T_INITIALIZER, OD_ENTRY_INITIALIZER } typedef struct epl_wmem_iarray epl_wmem_iarray_t; diff --git a/epan/range.h b/epan/range.h index c37586bd6e..f090055240 100644 --- a/epan/range.h +++ b/epan/range.h @@ -48,6 +48,7 @@ typedef struct range_admin_tag { guint32 low; guint32 high; } range_admin_t; +#define RANGE_ADMIN_T_INITIALIZER { 0, 0 } /** user specified range(s) */ typedef struct epan_range { |