diff options
author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-23 21:53:24 +0000 |
---|---|---|
committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-23 21:53:24 +0000 |
commit | 2424dce445adbeefe0e7545aec4d011efbfdc2af (patch) | |
tree | 938f1c9ef63a5de1c34d0d27962846517674d353 | |
parent | ebb405832fb946ac7ef1636d2ed786c084512f7d (diff) |
Renamed some local variables to avoid name collisions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25565 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | epan/dissectors/packet-cimd.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-clnp.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-cops.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-dcc.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-epm.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-rpriv.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-rs_misc.c | 6 |
7 files changed, 29 insertions, 29 deletions
diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index 5f755712f4..28bc18a4b5 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -603,7 +603,7 @@ static void dissect_cimd_operation(tvbuff_t *tvb, proto_tree *tree, gint etxp, guint16 checksum, guint8 last1,guint8 OC, guint8 PN) { guint PC = 0; /* Parameter code */ - gint index; + gint idx; gint offset = 0; gint endOffset = 0; proto_item *cimd_item = NULL; @@ -626,10 +626,10 @@ dissect_cimd_operation(tvbuff_t *tvb, proto_tree *tree, gint etxp, guint16 check break; PC = decimal_int_value(tvb, offset + 1, CIMD_PC_LENGTH); - match_strval_idx(PC, cimd_vals_PC, &index); - if (index != -1 && tree) + match_strval_idx(PC, cimd_vals_PC, &idx); + if (idx != -1 && tree) { - (vals_hdr_PC[index].diss)(tvb, cimd_tree, index, offset, endOffset); + (vals_hdr_PC[idx].diss)(tvb, cimd_tree, idx, offset, endOffset); } offset = endOffset; } diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 11c14cb3a8..2dc8643280 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -429,7 +429,7 @@ static gchar *print_tsap(const guchar *tsap, int length) gchar *cur; gboolean allprintable; - size_t index = 0, returned_length; + size_t idx = 0, returned_length; cur=ep_alloc(MAX_TSAP_LEN * 2 + 3); cur[0] = '\0'; @@ -439,15 +439,15 @@ static gchar *print_tsap(const guchar *tsap, int length) allprintable = is_all_printable(tsap,length); if (!allprintable) { returned_length = g_snprintf(cur, MAX_TSAP_LEN * 2 + 3, "0x"); - index += MIN(returned_length, MAX_TSAP_LEN * 2 + 3 - 1); + idx += MIN(returned_length, MAX_TSAP_LEN * 2 + 3 - 1); } while (length != 0) { if (allprintable) { - returned_length = g_snprintf(&cur[index], MAX_TSAP_LEN * 2 + 3 - index, "%c", *tsap ++); - index += MIN(returned_length, MAX_TSAP_LEN * 2 + 3 - index - 1 ); + returned_length = g_snprintf(&cur[idx], MAX_TSAP_LEN * 2 + 3 - idx, "%c", *tsap ++); + idx += MIN(returned_length, MAX_TSAP_LEN * 2 + 3 - idx - 1 ); } else { - returned_length = g_snprintf(&cur[index], MAX_TSAP_LEN * 2 + 3 - index, "%02x", *tsap ++); - index += MIN(returned_length, MAX_TSAP_LEN * 2 + 3 - index - 1); + returned_length = g_snprintf(&cur[idx], MAX_TSAP_LEN * 2 + 3 - idx, "%02x", *tsap ++); + idx += MIN(returned_length, MAX_TSAP_LEN * 2 + 3 - idx - 1); } length --; } diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index ebcc823ce3..2f0abd697b 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1270,11 +1270,11 @@ static void dissect_cops_object_data(tvbuff_t *tvb, packet_info *pinfo, guint32 break; if (tvb_strnlen(tvb, offset, len) == -1) { - proto_item *ti; - ti = proto_tree_add_text(tree, tvb, offset, len, "PEP Id is not a NULL terminated ASCII string"); - expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_NOTE, + proto_item *pep_ti; + pep_ti = proto_tree_add_text(tree, tvb, offset, len, "PEP Id is not a NULL terminated ASCII string"); + expert_add_info_format(pinfo, pep_ti, PI_MALFORMED, PI_NOTE, "PEP Id is not a NULL terminated ASCII string"); - PROTO_ITEM_SET_GENERATED(ti); + PROTO_ITEM_SET_GENERATED(pep_ti); } else proto_tree_add_item(tree, hf_cops_pepid, tvb, offset, diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c index af28a29ac3..3fe8e6db71 100644 --- a/epan/dissectors/packet-dcc.c +++ b/epan/dissectors/packet-dcc.c @@ -124,12 +124,12 @@ static gint ett_dcc_trace = -1; #define D_CHECKSUM() { \ - proto_tree *cktree, *ti; \ - ti = proto_tree_add_text(dcc_optree, tvb, offset, sizeof(DCC_CK), \ + proto_tree *cktree, *ckti; \ + ckti = proto_tree_add_text(dcc_optree, tvb, offset, sizeof(DCC_CK), \ "Checksum - %s", val_to_str(tvb_get_guint8(tvb,offset), \ dcc_cktype_vals, \ "Unknown Type: %u")); \ - cktree = proto_item_add_subtree(ti, ett_dcc_ck); \ + cktree = proto_item_add_subtree(ckti, ett_dcc_ck); \ proto_tree_add_item(cktree, hf_dcc_ck_type, tvb, offset, 1, FALSE); \ offset += 1; \ proto_tree_add_item(cktree, hf_dcc_ck_len, tvb, offset, 1, FALSE); \ diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c index 762a883f88..c3241e6f21 100644 --- a/epan/dissectors/packet-dcerpc-epm.c +++ b/epan/dissectors/packet-dcerpc-epm.c @@ -167,7 +167,7 @@ epm_dissect_ept_entry_t(tvbuff_t *tvb, int offset, proto_tree *tree=NULL; int old_offset=offset; guint32 len; - gint strlen; + gint slen; dcerpc_info *di; const char *str; @@ -193,19 +193,19 @@ epm_dissect_ept_entry_t(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_epm_ann_len, &len); str=(const char *)tvb_get_ptr(tvb, offset, -1); - strlen=len; - strlen=MIN(strlen,tvb_length_remaining(tvb, offset)); + slen=len; + slen=MIN(slen,tvb_length_remaining(tvb, offset)); tvb_ensure_bytes_exist(tvb, offset, len); proto_tree_add_item(tree, hf_epm_annotation, tvb, offset, len, TRUE); offset += len; if(str&&str[0]){ if(parent_tree) { - proto_item_append_text(item, " Service:%*s ", strlen, str); - proto_item_append_text(tree->parent, " Service:%*s ", strlen, str); + proto_item_append_text(item, " Service:%*s ", slen, str); + proto_item_append_text(tree->parent, " Service:%*s ", slen, str); } if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", Service:%*s", strlen, str); + col_append_fstr(pinfo->cinfo, COL_INFO, ", Service:%*s", slen, str); } } diff --git a/epan/dissectors/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c index 4ca249afc7..68421dcd64 100644 --- a/epan/dissectors/packet-dcerpc-rpriv.c +++ b/epan/dissectors/packet-dcerpc-rpriv.c @@ -74,7 +74,7 @@ rpriv_dissect_get_eptgt_rqst (tvbuff_t *tvb, int offset, */ guint32 authn_svc, authz_svc, key_size, key_size2, var1; - const char *key_t = NULL; + const char *key_t1 = NULL; const char *key_t2 = NULL; offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_rpriv_get_eptgt_rqst_authn_svc, &authn_svc); @@ -85,7 +85,7 @@ rpriv_dissect_get_eptgt_rqst (tvbuff_t *tvb, int offset, /* advance to get size of cell, and princ */ proto_tree_add_string (tree, hf_rpriv_get_eptgt_rqst_key_t, tvb, offset, hf_rpriv_get_eptgt_rqst_key_size, tvb_get_ptr (tvb, offset, key_size)); - key_t = (const char *)tvb_get_ptr(tvb,offset,key_size); + key_t1 = (const char *)tvb_get_ptr(tvb,offset,key_size); offset += key_size; offset += 8; @@ -97,7 +97,7 @@ rpriv_dissect_get_eptgt_rqst (tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, - " Request for: %s in %s ", key_t2, key_t); + " Request for: %s in %s ", key_t2, key_t1); } return offset; diff --git a/epan/dissectors/packet-dcerpc-rs_misc.c b/epan/dissectors/packet-dcerpc-rs_misc.c index 4bae922f26..56c506a5b2 100644 --- a/epan/dissectors/packet-dcerpc-rs_misc.c +++ b/epan/dissectors/packet-dcerpc-rs_misc.c @@ -62,7 +62,7 @@ rs_misc_dissect_login_get_info_rqst (tvbuff_t *tvb, int offset, { guint32 key_size; - const char *key_t = NULL; + const char *key_t1 = NULL; offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_rs_misc_login_get_info_rqst_var, NULL); @@ -72,12 +72,12 @@ rs_misc_dissect_login_get_info_rqst (tvbuff_t *tvb, int offset, if (key_size){ /* Not able to yet decipher the OTHER versions of this call just yet. */ proto_tree_add_string (tree, hf_rs_misc_login_get_info_rqst_key_t, tvb, offset, hf_rs_misc_login_get_info_rqst_key_size, tvb_get_ptr (tvb, offset, key_size)); - key_t = (const char *)tvb_get_ptr(tvb,offset,key_size); + key_t1 = (const char *)tvb_get_ptr(tvb,offset,key_size); offset += key_size; if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, - "rs_login_get_info Request for: %s ", key_t); + "rs_login_get_info Request for: %s ", key_t1); } } else { if (check_col(pinfo->cinfo, COL_INFO)) { |