diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-09-02 22:53:05 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-09-03 06:05:43 +0000 |
| commit | 2be3820912ecee71f0feb5fcc36fdfa53041908d (patch) | |
| tree | 9a0ca48cdbe7f70833ac5fcfb663ac70938e91a5 /asn1 | |
| parent | 32e785f81320342058bbee95f84095cd55449c09 (diff) | |
Address "shadow" warnings found by checkAPI script.
These aren't "true" shadow issues, but the script doesn't completely understand C syntax (for things like struct member names "time" and "index"). But fixing them creates less noise.
Change-Id: I5a2db1549095824530428529e86cab453c031a04
Reviewed-on: https://code.wireshark.org/review/10368
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 2 | ||||
| -rw-r--r-- | asn1/pres/packet-pres-template.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 9c31a461f0..d6a80dc586 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -113,7 +113,7 @@ generate_key_or_iv(unsigned int id, tvbuff_t *salt_tvb, unsigned int iter, if (pw == NULL) pwlen = 0; else - pwlen = strlen (pw); + pwlen = strlen(pw); if (pwlen > 63 / 2) { diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c index 5ec32a1fb2..2f1161e043 100644 --- a/asn1/pres/packet-pres-template.c +++ b/asn1/pres/packet-pres-template.c @@ -67,7 +67,7 @@ static guint32 presentation_context_identifier; typedef struct _pres_ctx_oid_t { guint32 ctx_id; char *oid; - guint32 index; + guint32 idx; } pres_ctx_oid_t; static GHashTable *pres_ctx_oid_table = NULL; @@ -111,7 +111,7 @@ pres_ctx_oid_equal(gconstpointer k1, gconstpointer k2) { const pres_ctx_oid_t *pco1=(const pres_ctx_oid_t *)k1; const pres_ctx_oid_t *pco2=(const pres_ctx_oid_t *)k2; - return (pco1->ctx_id==pco2->ctx_id && pco1->index==pco2->index); + return (pco1->ctx_id==pco2->ctx_id && pco1->idx==pco2->idx); } static void @@ -145,9 +145,9 @@ register_ctx_id_and_oid(packet_info *pinfo _U_, guint32 idx, const char *oid) conversation=find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation) { - pco->index = conversation->index; + pco->idx = conversation->index; } else { - pco->index = 0; + pco->idx = 0; } /* if this ctx already exists, remove the old one first */ @@ -187,9 +187,9 @@ find_oid_by_pres_ctx_id(packet_info *pinfo, guint32 idx) conversation=find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation) { - pco.index = conversation->index; + pco.idx = conversation->index; } else { - pco.index = 0; + pco.idx = 0; } tmppco=(pres_ctx_oid_t *)g_hash_table_lookup(pres_ctx_oid_table, &pco); |