diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-02-23 04:35:23 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-02-23 04:35:23 +0000 |
| commit | b395a98305d447d544b480f5de59b3d76b7e7797 (patch) | |
| tree | 3da9f7edf233ea0fd8da8fe6176170656152bb1a /asn1/gsm_map | |
| parent | c85899e946cf25597d3bd1328632bbb5c5456012 (diff) | |
| download | wireshark-b395a98305d447d544b480f5de59b3d76b7e7797.tar.gz | |
Squelch a bunch of compiler warnings.
svn path=/trunk/; revision=31961
Diffstat (limited to 'asn1/gsm_map')
| -rw-r--r-- | asn1/gsm_map/gsm_map.cnf | 2 | ||||
| -rw-r--r-- | asn1/gsm_map/packet-gsm_map-template.c | 6 | ||||
| -rw-r--r-- | asn1/gsm_map/packet-gsm_map-template.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/asn1/gsm_map/gsm_map.cnf b/asn1/gsm_map/gsm_map.cnf index 73480f62d5..6f555563d5 100644 --- a/asn1/gsm_map/gsm_map.cnf +++ b/asn1/gsm_map/gsm_map.cnf @@ -195,7 +195,7 @@ MAP-DialoguePDU B "0.4.0.0.1.1.1.1" "map-DialogueAS" #.FN_BODY TBCD-STRING VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb; - char *digit_str; + const char *digit_str; %(DEFAULT_BODY)s diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c index 55c2a9eb30..5d8e92b24f 100644 --- a/asn1/gsm_map/packet-gsm_map-template.c +++ b/asn1/gsm_map/packet-gsm_map-template.c @@ -234,7 +234,7 @@ static const value_string gsm_map_disc_par_vals[] = { { 0, NULL } }; -char * +const char * unpack_digits(tvbuff_t *tvb, int offset) { int length; @@ -245,7 +245,7 @@ unpack_digits(tvbuff_t *tvb, int offset) { length = tvb_length(tvb); if (length < offset) return ""; - digit_str = ep_alloc((length - offset)*2+1); + digit_str = (char *)ep_alloc((length - offset)*2+1); while ( offset < length ){ @@ -719,7 +719,7 @@ dissect_cbs_data_coding_scheme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree void dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - char *digit_str; + const char *digit_str; guint8 octet; guint8 na; guint8 np; diff --git a/asn1/gsm_map/packet-gsm_map-template.h b/asn1/gsm_map/packet-gsm_map-template.h index b82af1aea7..6f167adeb8 100644 --- a/asn1/gsm_map/packet-gsm_map-template.h +++ b/asn1/gsm_map/packet-gsm_map-template.h @@ -44,7 +44,7 @@ typedef struct _gsm_map_tap_rec_t { #define SMS_ENCODING_UCS2_LANG 5 WS_VAR_IMPORT const value_string gsm_map_opr_code_strings[]; -char* unpack_digits(tvbuff_t *tvb, int offset); +const char* unpack_digits(tvbuff_t *tvb, int offset); extern const value_string ssCode_vals[]; extern const value_string gsm_map_PDP_Type_Organisation_vals[]; |