diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 21:06:52 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 21:06:52 +0000 |
| commit | b8481499646f07512ceddac567887072822dffdb (patch) | |
| tree | 5fed08687f56b73cef1b398a4ddd32418a320332 | |
| parent | 1af56ab0c78799ab5b0a9b74d9cde4265b778260 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48428
| -rw-r--r-- | epan/dissectors/packet-ansi_a.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index 6dc7ceef37..65cfc3befe 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -8586,7 +8586,7 @@ typedef enum ANSI_A_E_NONE /* NONE */ } elem_idx_t; -static elem_idx_t ansi_a_elem_1_max = 0; +static elem_idx_t ansi_a_elem_1_max = (elem_idx_t)0; #define MAX_IOS401_NUM_ELEM_1 (sizeof(ansi_a_ios401_elem_1_strings)/sizeof(ext_value_string_t)) #define MAX_IOS501_NUM_ELEM_1 (sizeof(ansi_a_ios501_elem_1_strings)/sizeof(ext_value_string_t)) @@ -11587,7 +11587,7 @@ dissect_cdma2000_a1_elements(tvbuff_t *tvb, _U_ packet_info *pinfo, proto_tree * guint32 curr_offset; guint32 consumed; guint curr_len; - elem_idx_t idx; + unsigned idx; guint8 oct; curr_offset = offset; @@ -11603,16 +11603,16 @@ dissect_cdma2000_a1_elements(tvbuff_t *tvb, _U_ packet_info *pinfo, proto_tree * */ oct = tvb_get_guint8(tvb, curr_offset); - for (idx=0; idx < ansi_a_elem_1_max; idx++) + for (idx=0; idx < (unsigned)ansi_a_elem_1_max; idx++) { if (oct == (guint8) ansi_a_elem_1_strings[idx].value) { - ELEM_OPT_TLV(idx, ""); + ELEM_OPT_TLV((elem_idx_t)idx, ""); break; } } - if (idx == ansi_a_elem_1_max) + if (idx == (elem_idx_t)ansi_a_elem_1_max) { /* * didn't recognize the T(ype) @@ -12219,14 +12219,14 @@ proto_reg_handoff_ansi_a(void) ansi_a_bsmap_strings = ansi_a_ios501_bsmap_strings; ansi_a_dtap_strings = ansi_a_ios501_dtap_strings; ansi_a_elem_1_strings = ansi_a_ios501_elem_1_strings; - ansi_a_elem_1_max = MAX_IOS501_NUM_ELEM_1; + ansi_a_elem_1_max = (elem_idx_t)MAX_IOS501_NUM_ELEM_1; break; default: ansi_a_bsmap_strings = ansi_a_ios401_bsmap_strings; ansi_a_dtap_strings = ansi_a_ios401_dtap_strings; ansi_a_elem_1_strings = ansi_a_ios401_elem_1_strings; - ansi_a_elem_1_max = MAX_IOS401_NUM_ELEM_1; + ansi_a_elem_1_max = (elem_idx_t)MAX_IOS401_NUM_ELEM_1; break; } } |