diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-10-31 18:42:53 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-10-31 18:42:53 +0000 |
| commit | 856eb34afafa26628269023846227079b594e7b7 (patch) | |
| tree | 37484e371efe01a7a35977fd0d17fcc3428850e3 | |
| parent | ee7ed4da0352b48689c40e0060defb57f68d7f37 (diff) | |
Do not call a variable value_string as we have a struct with this name.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26658 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | epan/dissectors/packet-ber.h | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-per.c | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-per.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h index fde968e073..8b80e76525 100644 --- a/epan/dissectors/packet-ber.h +++ b/epan/dissectors/packet-ber.h @@ -185,7 +185,7 @@ extern int dissect_ber_GeneralString(asn1_ctx_t *actx, proto_tree *tree, tvbuff_ /* this function dissects a BER Object Identifier */ extern int dissect_ber_object_identifier(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **value_tvb); -extern int dissect_ber_object_identifier_str(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, const char **value_string); +extern int dissect_ber_object_identifier_str(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, const char **value_stringx); /* this function dissects a BER sequence of */ diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index 81ae387686..fdf502ab6d 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -900,18 +900,18 @@ DEBUG_ENTRY("dissect_per_object_identifier"); } guint32 -dissect_per_object_identifier_str(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, const char **value_string) +dissect_per_object_identifier_str(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, const char **value_stringx) { tvbuff_t *value_tvb = NULL; guint length; - offset = dissect_per_object_identifier(tvb, offset, actx, tree, hf_index, (value_string) ? &value_tvb : NULL); + offset = dissect_per_object_identifier(tvb, offset, actx, tree, hf_index, (value_stringx) ? &value_tvb : NULL); - if (value_string) { + if (value_stringx) { if (value_tvb && (length = tvb_length(value_tvb))) { - *value_string = oid_encoded2string(tvb_get_ptr(value_tvb, 0, length), length); + *value_stringx = oid_encoded2string(tvb_get_ptr(value_tvb, 0, length), length); } else { - *value_string = ""; + *value_stringx = ""; } } diff --git a/epan/dissectors/packet-per.h b/epan/dissectors/packet-per.h index 6dd9ab72bd..02b9d0bd9a 100644 --- a/epan/dissectors/packet-per.h +++ b/epan/dissectors/packet-per.h @@ -92,7 +92,7 @@ extern guint32 dissect_per_constrained_set_of(tvbuff_t *tvb, guint32 offset, asn extern guint32 dissect_per_set_of(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *parent_tree, int hf_index, gint ett_index, const per_sequence_t *seq); extern guint32 dissect_per_object_identifier(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, tvbuff_t **value_tvb); -extern guint32 dissect_per_object_identifier_str(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, const char **value_string); +extern guint32 dissect_per_object_identifier_str(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, const char **value_stringx); extern guint32 dissect_per_boolean(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, gboolean *bool); |