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 /epan/dissectors | |
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 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-bthfp.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-bthsp.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-collectd.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-dmp.c | 14 | ||||
-rw-r--r-- | epan/dissectors/packet-http2.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-lbmc.c | 18 | ||||
-rw-r--r-- | epan/dissectors/packet-lbmr.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-ndmp.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-opensafety.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-pkcs12.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-pres.c | 12 |
11 files changed, 58 insertions, 58 deletions
diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index 43e394c4da..34f2757d63 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -196,7 +196,7 @@ typedef struct _fragment_t { guint32 dlci; guint32 role; - guint index; + guint idx; guint length; guint8 *data; struct _fragment_t *previous_fragment; @@ -2062,7 +2062,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) fragment->chandle = chandle; fragment->dlci = dlci; fragment->role = role; - fragment->index = previous_fragment ? previous_fragment->index + previous_fragment->length : 0; + fragment->idx = previous_fragment ? previous_fragment->idx + previous_fragment->length : 0; fragment->reassemble_state = REASSEMBLE_FRAGMENT; fragment->length = tvb_reported_length(tvb); fragment->data = (guint8 *) wmem_alloc(wmem_file_scope(), fragment->length); @@ -2121,7 +2121,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) fragment->dlci == dlci && fragment->role == role) { i_fragment = fragment; - while (i_fragment && i_fragment->index > 0) { + while (i_fragment && i_fragment->idx > 0) { i_fragment = i_fragment->previous_fragment; } @@ -2191,8 +2191,8 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) guint8 *at_data; guint i_data_offset; - i_data_offset = fragment->index + fragment->length; - at_data = (guint8 *) wmem_alloc(pinfo->pool, fragment->index + fragment->length); + i_data_offset = fragment->idx + fragment->length; + at_data = (guint8 *) wmem_alloc(pinfo->pool, fragment->idx + fragment->length); i_fragment = fragment; @@ -2203,7 +2203,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } if (i_fragment) { - while (i_fragment && i_fragment->index > 0) { + while (i_fragment && i_fragment->idx > 0) { i_data_offset -= i_fragment->length; memcpy(at_data + i_data_offset, i_fragment->data, i_fragment->length); i_fragment = i_fragment->previous_fragment; @@ -2219,11 +2219,11 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } } - if (fragment->index > 0 && fragment->length > 0) { + if (fragment->idx > 0 && fragment->length > 0) { proto_tree_add_item(main_tree, hf_fragment, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII | ENC_NA); reassembled_tvb = tvb_new_child_real_data(tvb, at_data, - fragment->index + fragment->length, fragment->index + fragment->length); + fragment->idx + fragment->length, fragment->idx + fragment->length); add_new_data_source(pinfo, reassembled_tvb, "Reassembled HFP"); } diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c index d638e6c5aa..30af8efa45 100644 --- a/epan/dissectors/packet-bthsp.c +++ b/epan/dissectors/packet-bthsp.c @@ -92,7 +92,7 @@ typedef struct _fragment_t { guint32 dlci; guint32 role; - guint index; + guint idx; guint length; guint8 *data; struct _fragment_t *previous_fragment; @@ -830,7 +830,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) fragment->chandle = chandle; fragment->dlci = dlci; fragment->role = role; - fragment->index = previous_fragment ? previous_fragment->index + previous_fragment->length : 0; + fragment->idx = previous_fragment ? previous_fragment->idx + previous_fragment->length : 0; fragment->reassemble_state = REASSEMBLE_FRAGMENT; fragment->length = tvb_reported_length(tvb); fragment->data = (guint8 *) wmem_alloc(wmem_file_scope(), fragment->length); @@ -889,7 +889,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) fragment->dlci == dlci && fragment->role == role) { i_fragment = fragment; - while (i_fragment && i_fragment->index > 0) { + while (i_fragment && i_fragment->idx > 0) { i_fragment = i_fragment->previous_fragment; } @@ -958,8 +958,8 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) guint8 *at_data; guint i_data_offset; - i_data_offset = fragment->index + fragment->length; - at_data = (guint8 *) wmem_alloc(pinfo->pool, fragment->index + fragment->length); + i_data_offset = fragment->idx + fragment->length; + at_data = (guint8 *) wmem_alloc(pinfo->pool, fragment->idx + fragment->length); i_fragment = fragment; @@ -971,7 +971,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } if (i_fragment) { - while (i_fragment && i_fragment->index > 0) { + while (i_fragment && i_fragment->idx > 0) { i_data_offset -= i_fragment->length; memcpy(at_data + i_data_offset, i_fragment->data, i_fragment->length); i_fragment = i_fragment->previous_fragment; @@ -987,11 +987,11 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } } - if (fragment->index > 0 && fragment->length > 0) { + if (fragment->idx > 0 && fragment->length > 0) { proto_tree_add_item(main_tree, hf_fragment, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII | ENC_NA); reassembled_tvb = tvb_new_child_real_data(tvb, at_data, - fragment->index + fragment->length, fragment->index + fragment->length); + fragment->idx + fragment->length, fragment->idx + fragment->length); add_new_data_source(pinfo, reassembled_tvb, "Reassembled HSP"); } diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index 5c6973aabe..65522d2488 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -54,7 +54,7 @@ typedef struct value_data_s { gchar *host; gint host_off; gint host_len; - guint64 time; + guint64 time_value; gint time_off; guint64 interval; gint interval_off; @@ -76,7 +76,7 @@ typedef struct notify_data_s { gchar *host; gint host_off; gint host_len; - guint64 time; + guint64 time_value; gint time_off; guint64 severity; gint severity_off; @@ -311,7 +311,7 @@ collectd_proto_tree_add_assembled_metric (tvbuff_t *tvb, vdispatch->type_instance_len, vdispatch->type_instance); - nstime = collectd_time_to_nstime (vdispatch->time); + nstime = collectd_time_to_nstime (vdispatch->time_value); proto_tree_add_time (subtree, hf_collectd_data_time, tvb, vdispatch->time_off, /* length = */ 8, &nstime); @@ -337,7 +337,7 @@ collectd_proto_tree_add_assembled_notification (tvbuff_t *tvb, ndispatch->host_off, ndispatch->host_len, STR_NONNULL (ndispatch->host)); - nstime = collectd_time_to_nstime (ndispatch->time); + nstime = collectd_time_to_nstime (ndispatch->time_value); proto_tree_add_time (subtree, hf_collectd_data_time, tvb, ndispatch->time_off, /* length = */ 8, &nstime); @@ -1168,7 +1168,7 @@ dissect_collectd (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_collectd_data_time, offset, &vdispatch.time_off, - &vdispatch.time, + &vdispatch.time_value, collectd_tree, &pi); if (status != 0) pkt_errors++; diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index 919bad8f13..815d6a2e3e 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -2687,8 +2687,8 @@ static gint dissect_mts_identifier (tvbuff_t *tvb, packet_info *pinfo _U_, proto } else { mts_id = tvb_bytes_to_str(wmem_packet_scope(), tvb, offset, dmp.mts_id_length); } - proto_item_append_text (dmp.mts_id_item, " (%zu bytes decompressed)", strlen (mts_id)); - mts_id = format_text (mts_id, strlen (mts_id)); + proto_item_append_text (dmp.mts_id_item, " (%zu bytes decompressed)", strlen(mts_id)); + mts_id = format_text (mts_id, strlen(mts_id)); if (subject) { proto_tree_add_string (tree, hf_message_subj_mts_id, tvb, offset, dmp.mts_id_length, mts_id); hidden_item = proto_tree_add_string (tree, hf_mts_id, tvb, offset, dmp.mts_id_length, mts_id); @@ -2738,8 +2738,8 @@ static gint dissect_ipm_identifier (tvbuff_t *tvb, packet_info *pinfo _U_, proto } else { ipm_id = tvb_bytes_to_str(wmem_packet_scope(), tvb, offset, ipm_id_length); } - proto_item_append_text (tf, " (%zu bytes decompressed)", strlen (ipm_id)); - ipm_id = format_text (ipm_id, strlen (ipm_id)); + proto_item_append_text (tf, " (%zu bytes decompressed)", strlen(ipm_id)); + ipm_id = format_text (ipm_id, strlen(ipm_id)); if (subject) { proto_tree_add_string (tree, hf_message_subj_ipm_id, tvb, offset, ipm_id_length, ipm_id); hidden_item = proto_tree_add_string (tree, hf_ipm_id, tvb, offset, ipm_id_length, ipm_id); @@ -3205,7 +3205,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo, offset += len; if (dmp.struct_id) { - proto_item_append_text (en, ", Id: %s", format_text (dmp.struct_id, strlen (dmp.struct_id))); + proto_item_append_text (en, ", Id: %s", format_text (dmp.struct_id, strlen(dmp.struct_id))); } proto_item_set_len (en, offset - boffset); @@ -4068,10 +4068,10 @@ static int dissect_dmp (tvbuff_t *tvb, packet_info *pinfo, } else if (dmp.struct_id) { if (dmp_align && !retrans_or_dup_ack) { col_append_fstr (pinfo->cinfo, COL_INFO, " Body Id: %s", - format_text (dmp.struct_id, strlen (dmp.struct_id))); + format_text (dmp.struct_id, strlen(dmp.struct_id))); } else { col_append_fstr (pinfo->cinfo, COL_INFO, ", Body Id: %s", - format_text (dmp.struct_id, strlen (dmp.struct_id))); + format_text (dmp.struct_id, strlen(dmp.struct_id))); } } if (dmp.checksum && (checksum1 != checksum2)) { diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index ffb85558b4..e43e8a333a 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -79,7 +79,7 @@ typedef struct { guint datalen; /* name index or name/value index if type is one of HTTP2_HD_INDEXED and HTTP2_HD_*_INDEXED_NAMEs */ - guint index; + guint idx; } data; /* header table size if type == HTTP2_HD_HEADER_TABLE_SIZE_UPDATE */ guint header_table_size; @@ -685,7 +685,7 @@ inflate_http2_header_block(tvbuff_t *tvb, packet_info *pinfo, guint offset, out->type = header_repr_info->type; out->length = rv; - out->table.data.index = header_repr_info->integer; + out->table.data.idx = header_repr_info->integer; out->table.data.datalen = (guint)(4 + nv.namelen + 4 + nv.valuelen); @@ -820,7 +820,7 @@ inflate_http2_header_block(tvbuff_t *tvb, packet_info *pinfo, guint offset, in->type == HTTP2_HD_LITERAL_INDEXING_INDEXED_NAME || in->type == HTTP2_HD_LITERAL_INDEXED_NAME || in->type == HTTP2_HD_LITERAL_NEVER_INDEXING_INDEXED_NAME) { - proto_tree_add_uint(header_tree, hf_http2_header_index, tvb, offset, in->length, in->table.data.index); + proto_tree_add_uint(header_tree, hf_http2_header_index, tvb, offset, in->length, in->table.data.idx); } proto_item_append_text(header, ": %s: %s", header_name, header_value); diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index 53c41fe481..bdcc004e28 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -2160,7 +2160,7 @@ typedef struct lbm_uint8_t flags; lbm_uint8_t type; lbm_uint32_t domain_id; - lbm_uint8_t index[8]; + lbm_uint8_t idx[8]; } lbmc_cntl_pattern_interest_hdr_t; #define O_LBMC_CNTL_PATTERN_INTEREST_HDR_T_NEXT_HDR OFFSETOF(lbmc_cntl_pattern_interest_hdr_t, next_hdr) #define L_LBMC_CNTL_PATTERN_INTEREST_HDR_T_NEXT_HDR SIZEOF(lbmc_cntl_pattern_interest_hdr_t, next_hdr) @@ -2172,8 +2172,8 @@ typedef struct #define L_LBMC_CNTL_PATTERN_INTEREST_HDR_T_TYPE SIZEOF(lbmc_cntl_pattern_interest_hdr_t, type) #define O_LBMC_CNTL_PATTERN_INTEREST_HDR_T_DOMAIN_ID OFFSETOF(lbmc_cntl_pattern_interest_hdr_t, domain_id) #define L_LBMC_CNTL_PATTERN_INTEREST_HDR_T_DOMAIN_ID SIZEOF(lbmc_cntl_pattern_interest_hdr_t, domain_id) -#define O_LBMC_CNTL_PATTERN_INTEREST_HDR_T_INDEX OFFSETOF(lbmc_cntl_pattern_interest_hdr_t, index) -#define L_LBMC_CNTL_PATTERN_INTEREST_HDR_T_INDEX SIZEOF(lbmc_cntl_pattern_interest_hdr_t, index) +#define O_LBMC_CNTL_PATTERN_INTEREST_HDR_T_INDEX OFFSETOF(lbmc_cntl_pattern_interest_hdr_t, idx) +#define L_LBMC_CNTL_PATTERN_INTEREST_HDR_T_INDEX SIZEOF(lbmc_cntl_pattern_interest_hdr_t, idx) #define L_LBMC_CNTL_PATTERN_INTEREST_HDR_T (gint) sizeof(lbmc_cntl_pattern_interest_hdr_t) /* LBMC control advertisement header */ @@ -2897,7 +2897,7 @@ typedef struct lbm_uint8_t type; lbm_uint16_t domain_count; lbm_uint16_t res1; - lbm_uint8_t index[8]; + lbm_uint8_t idx[8]; } lbmc_cntl_pattern_md_interest_hdr_t; #define O_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_NEXT_HDR OFFSETOF(lbmc_cntl_pattern_md_interest_hdr_t, next_hdr) #define L_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_NEXT_HDR SIZEOF(lbmc_cntl_pattern_md_interest_hdr_t, next_hdr) @@ -2911,8 +2911,8 @@ typedef struct #define L_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_DOMAIN_COUNT SIZEOF(lbmc_cntl_pattern_md_interest_hdr_t, domain_count) #define O_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_RES1 OFFSETOF(lbmc_cntl_pattern_md_interest_hdr_t, res1) #define L_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_RES1 SIZEOF(lbmc_cntl_pattern_md_interest_hdr_t, res1) -#define O_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_INDEX OFFSETOF(lbmc_cntl_pattern_md_interest_hdr_t, index) -#define L_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_INDEX SIZEOF(lbmc_cntl_pattern_md_interest_hdr_t, index) +#define O_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_INDEX OFFSETOF(lbmc_cntl_pattern_md_interest_hdr_t, idx) +#define L_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_INDEX SIZEOF(lbmc_cntl_pattern_md_interest_hdr_t, idx) #define L_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T (gint) sizeof(lbmc_cntl_pattern_md_interest_hdr_t) /* LBMC control TNWG keepalive header */ @@ -2921,7 +2921,7 @@ typedef struct lbm_uint8_t next_hdr; lbm_uint8_t hdr_len; lbm_uint16_t flags; - lbm_uint32_t index; + lbm_uint32_t idx; lbm_uint8_t ts_seconds[8]; lbm_uint32_t ts_microseconds; lbm_uint32_t reserved_1; @@ -2937,8 +2937,8 @@ typedef struct #define L_LBMC_CNTL_TNWG_KA_HDR_T_HDR_LEN SIZEOF(lbmc_cntl_tnwg_ka_hdr_t, hdr_len) #define O_LBMC_CNTL_TNWG_KA_HDR_T_FLAGS OFFSETOF(lbmc_cntl_tnwg_ka_hdr_t, flags) #define L_LBMC_CNTL_TNWG_KA_HDR_T_FLAGS SIZEOF(lbmc_cntl_tnwg_ka_hdr_t, flags) -#define O_LBMC_CNTL_TNWG_KA_HDR_T_INDEX OFFSETOF(lbmc_cntl_tnwg_ka_hdr_t, index) -#define L_LBMC_CNTL_TNWG_KA_HDR_T_INDEX SIZEOF(lbmc_cntl_tnwg_ka_hdr_t, index) +#define O_LBMC_CNTL_TNWG_KA_HDR_T_INDEX OFFSETOF(lbmc_cntl_tnwg_ka_hdr_t, idx) +#define L_LBMC_CNTL_TNWG_KA_HDR_T_INDEX SIZEOF(lbmc_cntl_tnwg_ka_hdr_t, idx) #define O_LBMC_CNTL_TNWG_KA_HDR_T_TS_SECONDS OFFSETOF(lbmc_cntl_tnwg_ka_hdr_t, ts_seconds) #define L_LBMC_CNTL_TNWG_KA_HDR_T_TS_SECONDS SIZEOF(lbmc_cntl_tnwg_ka_hdr_t, ts_seconds) #define O_LBMC_CNTL_TNWG_KA_HDR_T_TS_MICROSECONDS OFFSETOF(lbmc_cntl_tnwg_ka_hdr_t, ts_microseconds) diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c index abeb5172dd..2b99ec64d2 100644 --- a/epan/dissectors/packet-lbmr.c +++ b/epan/dissectors/packet-lbmr.c @@ -340,7 +340,7 @@ typedef struct lbm_uint8_t transport; lbm_uint8_t tlen; lbm_uint16_t ttl; - lbm_uint32_t index; + lbm_uint32_t idx; } lbmr_tir_t; #define O_LBMR_TIR_T_TRANSPORT OFFSETOF(lbmr_tir_t, transport) #define L_LBMR_TIR_T_TRANSPORT SIZEOF(lbmr_tir_t, transport) @@ -348,8 +348,8 @@ typedef struct #define L_LBMR_TIR_T_TLEN SIZEOF(lbmr_tir_t, tlen) #define O_LBMR_TIR_T_TTL OFFSETOF(lbmr_tir_t, ttl) #define L_LBMR_TIR_T_TTL SIZEOF(lbmr_tir_t, ttl) -#define O_LBMR_TIR_T_INDEX OFFSETOF(lbmr_tir_t, index) -#define L_LBMR_TIR_T_INDEX SIZEOF(lbmr_tir_t, index) +#define O_LBMR_TIR_T_INDEX OFFSETOF(lbmr_tir_t, idx) +#define L_LBMR_TIR_T_INDEX SIZEOF(lbmr_tir_t, idx) #define L_LBMR_TIR_T (gint) sizeof(lbmr_tir_t) /* LBMR topic information record TCP option data */ @@ -2707,7 +2707,7 @@ struct tir_node_t_stct { char * topic; char * source_string; - guint32 index; + guint32 idx; struct tir_node_t_stct * next; }; typedef struct tir_node_t_stct tir_node_t; @@ -2821,7 +2821,7 @@ static void add_contents_tir(lbmr_contents_t * contents, const char * topic, cha node = wmem_new(wmem_packet_scope(), tir_node_t); node->topic = wmem_strdup(wmem_packet_scope(), topic); node->source_string = source; - node->index = topic_index; + node->idx = topic_index; node->next = contents->contents.topic.tir; contents->contents.topic.tir = node; contents->contents.topic.tir_count++; @@ -5072,7 +5072,7 @@ static void lbmr_tap_queue_packet(packet_info * pinfo, const lbmr_contents_t * c tir_tap->size = (guint16) sizeof(lbm_lbmr_topic_advertisement_tap_info_t); tir_tap->topic_length = (guint8)strlen(tir->topic); tir_tap->source_length = (guint8)strlen(tir->source_string); - tir_tap->topic_index = tir->index; + tir_tap->topic_index = tir->idx; memcpy(tir_tap->topic, tir->topic, tir_tap->topic_length); memcpy(tir_tap->source, tir->source_string, tir_tap->source_length); tap_queue_packet(lbmr_topic_advertisement_tap_handle, pinfo, (void *) tir_tap); diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 3423d6b8fa..1efd88afc9 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -357,7 +357,7 @@ get_ndmp_protocol_version(void) struct ndmp_header { guint32 seq; - guint32 time; + guint32 timestamp; guint32 type; guint32 msg; guint32 rep_seq; @@ -2900,7 +2900,7 @@ dissect_ndmp_header(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *p offset += 4; /* timestamp */ - ns.secs=nh->time; + ns.secs=nh->timestamp; ns.nsecs=0; proto_tree_add_time(tree, hf_ndmp_timestamp, tvb, offset, 4, &ns); offset += 4; @@ -3201,7 +3201,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* } nh.seq = tvb_get_ntohl(new_tvb, offset); - nh.time = tvb_get_ntohl(new_tvb, offset+4); + nh.timestamp = tvb_get_ntohl(new_tvb, offset+4); nh.type = tvb_get_ntohl(new_tvb, offset+8); nh.msg = tvb_get_ntohl(new_tvb, offset+12); nh.rep_seq = tvb_get_ntohl(new_tvb, offset+16); diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index 124bf58cd2..aa6874cb04 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -1346,7 +1346,7 @@ opensafety_parse_scm_udid ( tvbuff_t* tvb, packet_info *pinfo, proto_tree *tree, scm_udid_test = tvb_bytes_to_str_punct(wmem_packet_scope(), tvb, offset, 6, ':' ); - if ( scm_udid_test != NULL && strlen ( scm_udid_test ) == 17 ) + if ( scm_udid_test != NULL && strlen( scm_udid_test ) == 17 ) { if ( g_strcmp0("00:00:00:00:00:00", scm_udid_test ) != 0 ) { @@ -1806,7 +1806,7 @@ dissect_opensafety_message(opensafety_packet_info *packet, } - if ( strlen ( (local_scm_udid != NULL ? local_scm_udid : global_scm_udid) ) > 0 && scmUDID->len == 6 ) + if ( strlen( (local_scm_udid != NULL ? local_scm_udid : global_scm_udid) ) > 0 && scmUDID->len == 6 ) { if ( local_scm_udid != NULL ) { diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index 27ab433f5d..1d98461022 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -204,7 +204,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/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index 9af2549f49..03c6b21a76 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -75,7 +75,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; @@ -243,7 +243,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 @@ -277,9 +277,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 */ @@ -319,9 +319,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); |