aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ber.c
diff options
context:
space:
mode:
authormartinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>2010-10-15 18:41:12 +0000
committermartinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>2010-10-15 18:41:12 +0000
commitf9f5e9548212609beb06340f75b636dc956b8055 (patch)
treeee1545b986f00319e492d05faad99fb79c4909ef /epan/dissectors/packet-ber.c
parentfcb3024a75b10f721cb4d0287b5f6c811615ff15 (diff)
Add volatile in several places to gcc warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34526 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ber.c')
-rw-r--r--epan/dissectors/packet-ber.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 3b7be5600c..c7e090d8fa 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -549,7 +549,7 @@ printf("dissect_ber_tagged_type(%s) entered\n",name);
}
static int
-try_dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *tree, gint nest_level)
+try_dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, volatile int offset, proto_tree *tree, gint nest_level)
{
int start_offset;
gint8 class;
@@ -561,7 +561,8 @@ try_dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tre
proto_tree *next_tree=NULL;
guint8 c;
guint32 i;
- gboolean is_printable, is_decoded_as;
+ gboolean is_printable;
+ volatile gboolean is_decoded_as;
proto_item *pi, *cause;
asn1_ctx_t asn1_ctx;
@@ -617,7 +618,7 @@ try_dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tre
case BER_UNI_TAG_OCTETSTRING:
is_decoded_as = FALSE;
if (decode_octetstring_as_ber && len >= 2) {
- int ber_offset = 0;
+ volatile int ber_offset = 0;
guint32 ber_len = 0;
TRY {
ber_offset = get_ber_identifier(tvb, offset, NULL, &pc, NULL);
@@ -710,7 +711,7 @@ try_dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tre
is_decoded_as = FALSE;
if (decode_primitive_as_ber && len >= 2) {
- int ber_offset = 0;
+ volatile int ber_offset = 0;
guint32 ber_len = 0;
TRY {
ber_offset = get_ber_identifier(tvb, offset, NULL, &pc, NULL);