diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2014-01-19 09:40:04 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2014-01-19 09:40:04 +0000 |
| commit | 95ed1b4977c656e0f2fd8fb3412144f5c3c64d86 (patch) | |
| tree | 84ae2c1a00b2b2c90f201e3fc2e1d4a184b4e2d1 /epan/oids.c | |
| parent | 113c6d5f55b3aad3d6b9061adea3ba40f15bc185 (diff) | |
As spotted by Joerg; make a HFILL_INIT(hf) macro and use it to init the private part of the hf structure.
svn path=/trunk/; revision=54843
Diffstat (limited to 'epan/oids.c')
| -rw-r--r-- | epan/oids.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/epan/oids.c b/epan/oids.c index 169319bbac..fcc748977e 100644 --- a/epan/oids.c +++ b/epan/oids.c @@ -633,11 +633,8 @@ static void register_mibs(void) { hf.hfinfo.strings = NULL; hf.hfinfo.bitmask = 0; hf.hfinfo.blurb = smiRenderOID(smiNode->oidlen, smiNode->oid, SMI_RENDER_ALL); - hf.hfinfo.id = -1; - hf.hfinfo.parent = 0; - hf.hfinfo.ref_type = HF_REF_TYPE_NONE; - hf.hfinfo.same_name_prev_id = -1; - hf.hfinfo.same_name_next = NULL; + /* HFILL */ + HFILL_INIT(hf); /* Don't allow duplicate blurb/name */ if (strcmp(hf.hfinfo.blurb, hf.hfinfo.name) == 0) { @@ -711,12 +708,8 @@ static void register_mibs(void) { hf.hfinfo.strings = NULL; hf.hfinfo.bitmask = 0; hf.hfinfo.blurb = NULL; - hf.hfinfo.id = -1; - hf.hfinfo.parent = 0; - hf.hfinfo.ref_type = HF_REF_TYPE_NONE; - hf.hfinfo.same_name_prev_id = -1; - hf.hfinfo.same_name_next = NULL; - + /* HFILL */ + HFILL_INIT(hf); D(5,("\t\t\tIndex: name=%s subids=%d key_type=%d", key->name, key->num_subids, key->key_type )); |