diff options
author | Jörg Mayer <jmayer@loplof.de> | 2005-07-27 07:57:01 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2005-07-27 07:57:01 +0000 |
commit | b8d33c4add7a81a15ac5b414269a6d292d9e2833 (patch) | |
tree | b7fd84054350968df697828fc24f22835963c082 | |
parent | 440cf5767fc641275a402219eb4bdf889fac4855 (diff) |
Fix >2600 warnings by doing char -> const char changes.
Additionally in dissectors/packet-ansi_map.c:
Flag unused parameters as such and remove dummy
param = param;
statements.
svn path=/trunk/; revision=15114
-rw-r--r-- | epan/dissectors/packet-afp.c | 7 | ||||
-rw-r--r-- | epan/dissectors/packet-alcap.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-ansi_637.c | 28 | ||||
-rw-r--r-- | epan/dissectors/packet-ansi_683.c | 62 | ||||
-rw-r--r-- | epan/dissectors/packet-ansi_801.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-ansi_a.c | 79 | ||||
-rw-r--r-- | epan/dissectors/packet-ansi_map.c | 878 | ||||
-rw-r--r-- | epan/dissectors/packet-arp.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-arp.h | 2 |
9 files changed, 443 insertions, 645 deletions
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index 3cad7c4f79..96300383a1 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -31,6 +31,7 @@ #endif #include <stdio.h> +#include <string.h> #ifdef NEED_SNPRINTF_H # include "snprintf.h" @@ -1704,11 +1705,11 @@ decode_vol_did_file_dir_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) } /* ------------------------ */ -static gchar * +static const gchar * get_name(tvbuff_t *tvb, int offset, int type) { int len; - gchar *string; + const gchar *string; switch (type) { case 1: @@ -1734,7 +1735,7 @@ decode_name_label (proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, gint off { int len; int header; - gchar *name; + const gchar *name; guint8 type; proto_tree *sub_tree = NULL; proto_item *item; diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c index 3253f4557e..7ea4b83913 100644 --- a/epan/dissectors/packet-alcap.c +++ b/epan/dissectors/packet-alcap.c @@ -95,8 +95,8 @@ static const value_string msg_parm_strings[] = { }; #define NUM_PARMS (sizeof(msg_parm_strings)/sizeof(value_string)) -static char *alcap_proto_name = "AAL type 2 signalling protocol - Capability set 1 (Q.2630.1)"; -static char *alcap_proto_name_short = "ALCAP"; +static const char *alcap_proto_name = "AAL type 2 signalling protocol - Capability set 1 (Q.2630.1)"; +static const char *alcap_proto_name_short = "ALCAP"; /* Initialize the subtree pointers */ static gint ett_alcap = -1; @@ -195,7 +195,7 @@ dis_field_compatibility(tvbuff_t *tvb, proto_tree *tree, guint32 *offset, gboole guint8 compat; proto_item *item; proto_tree *subtree; - gchar *str = NULL; + const gchar *str = NULL; curr_offset = *offset; @@ -448,7 +448,7 @@ dis_field_audio_service(tvbuff_t *tvb, proto_tree *tree, guint *len, guint32 *of guint8 oct; proto_item *item; proto_tree *subtree; - gchar *str = NULL; + const gchar *str = NULL; curr_offset = *offset; @@ -910,7 +910,7 @@ dis_field_nature_of_address(tvbuff_t *tvb, proto_tree *tree, guint *len, guint32 guint8 oct; proto_item *item; proto_tree *subtree; - gchar *str = NULL; + const gchar *str = NULL; curr_offset = *offset; @@ -1068,7 +1068,7 @@ dis_field_cause_value(tvbuff_t *tvb, proto_tree *tree, guint *len, guint32 *offs guint8 oct; proto_item *item; proto_tree *subtree; - gchar *str = NULL; + const gchar *str = NULL; *compat = FALSE; curr_offset = *offset; diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c index 27efbf6747..b073912fc4 100644 --- a/epan/dissectors/packet-ansi_637.c +++ b/epan/dissectors/packet-ansi_637.c @@ -51,9 +51,9 @@ #include "epan/packet.h" -static char *ansi_proto_name_tele = "ANSI IS-637-A (SMS) Teleservice Layer"; -static char *ansi_proto_name_trans = "ANSI IS-637-A (SMS) Transport Layer"; -static char *ansi_proto_name_short = "IS-637-A"; +static const char *ansi_proto_name_tele = "ANSI IS-637-A (SMS) Teleservice Layer"; +static const char *ansi_proto_name_trans = "ANSI IS-637-A (SMS) Transport Layer"; +static const char *ansi_proto_name_short = "IS-637-A"; static const value_string ansi_srvc_cat_strings[] = { { 0x0000, "Unknown or unspecified" }, @@ -312,7 +312,7 @@ tele_param_user_data(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) guint32 required_octs; guint32 saved_offset; guint32 i; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 2); @@ -516,8 +516,8 @@ tele_param_rel_timestamp(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 off { guint8 oct; guint32 value = 0; - gchar *str = NULL; - gchar *str2 = NULL; + const gchar *str = NULL; + const gchar *str2 = NULL; EXACT_DATA_CHECK(len, 1); @@ -554,7 +554,7 @@ static void tele_param_pri_ind(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); @@ -584,7 +584,7 @@ static void tele_param_priv_ind(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); @@ -656,7 +656,7 @@ static void tele_param_alert(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); @@ -686,7 +686,7 @@ static void tele_param_lang_ind(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); @@ -851,7 +851,7 @@ static void tele_param_disp_mode(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); @@ -952,7 +952,7 @@ trans_param_address(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset, guint32 saved_offset; guint32 required_octs; guint32 i; - gchar *str; + const gchar *str; SHORT_DATA_CHECK(len, 2); @@ -1224,7 +1224,7 @@ trans_param_subaddress(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offse { guint8 oct, oct2, num_fields; guint32 i; - gchar *str; + const gchar *str; SHORT_DATA_CHECK(len, 2); @@ -1338,7 +1338,7 @@ static void trans_param_cause_codes(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset, gchar *add_string) { guint8 oct; - gchar *str = NULL; + const gchar *str = NULL; oct = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c index 02479fb8ea..7a9b261755 100644 --- a/epan/dissectors/packet-ansi_683.c +++ b/epan/dissectors/packet-ansi_683.c @@ -46,8 +46,8 @@ #include "epan/packet.h" -static char *ansi_proto_name = "ANSI IS-683-A (OTA (Mobile))"; -static char *ansi_proto_name_short = "IS-683-A"; +static const char *ansi_proto_name = "ANSI IS-683-A (OTA (Mobile))"; +static const char *ansi_proto_name_short = "IS-683-A"; #define ANSI_683_FORWARD 0 #define ANSI_683_REVERSE 1 @@ -105,10 +105,10 @@ static proto_tree *g_tree; return; \ } -static gchar * +static const gchar * rev_feat_id_type(guint8 feat_id) { - gchar *str; + const gchar *str; switch (feat_id) { @@ -126,10 +126,10 @@ rev_feat_id_type(guint8 feat_id) return(str); } -static gchar * +static const gchar * rev_res_code_type(guint8 res_code) { - gchar *str; + const gchar *str; switch (res_code) { @@ -161,10 +161,10 @@ rev_res_code_type(guint8 res_code) #define CHANGE_SPC_VAL_BLOCK 1 #define VALDATE_SPASM_VAL_BLOCK 2 -static gchar * +static const gchar * for_val_param_block_type(guint8 block_type) { - gchar *str; + const gchar *str; switch (block_type) { @@ -180,10 +180,10 @@ for_val_param_block_type(guint8 block_type) return(str); } -static gchar * +static const gchar * rev_sspr_param_block_type(guint8 block_type) { - gchar *str; + const gchar *str; switch (block_type) { @@ -198,10 +198,10 @@ rev_sspr_param_block_type(guint8 block_type) return(str); } -static gchar * +static const gchar * for_sspr_param_block_type(guint8 block_type) { - gchar *str; + const gchar *str; switch (block_type) { @@ -220,10 +220,10 @@ for_sspr_param_block_type(guint8 block_type) #define CDMA_NAM_BLOCK 2 #define IMSI_T_NAM_BLOCK 3 -static gchar * +static const gchar * rev_nam_param_block_type(guint8 block_type) { - gchar *str; + const gchar *str; switch (block_type) { @@ -240,10 +240,10 @@ rev_nam_param_block_type(guint8 block_type) return(str); } -static gchar * +static const gchar * for_nam_param_block_type(guint8 block_type) { - gchar *str; + const gchar *str; switch (block_type) { @@ -719,7 +719,7 @@ static void msg_config_req(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct, num_blocks; - gchar *str = NULL; + const gchar *str = NULL; guint32 i, saved_offset; SHORT_DATA_CHECK(len, 1); @@ -764,7 +764,7 @@ static void msg_download_req(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct, block_id, block_len; - gchar *str = NULL; + const gchar *str = NULL; proto_tree *subtree; proto_item *item; guint32 i, saved_offset; @@ -956,7 +956,7 @@ static void msg_sspr_config_req(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct; - gchar *str = NULL; + const gchar *str = NULL; guint32 saved_offset; guint32 value; proto_tree *subtree; @@ -1014,7 +1014,7 @@ static void msg_sspr_download_req(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct, block_len; - gchar *str = NULL; + const gchar *str = NULL; guint32 saved_offset; proto_tree *subtree; proto_item *item; @@ -1064,7 +1064,7 @@ static void msg_validate_req(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct, block_id, block_len; - gchar *str = NULL; + const gchar *str = NULL; proto_tree *subtree; proto_item *item; guint32 i, saved_offset, block_offset; @@ -1181,7 +1181,7 @@ static void msg_config_rsp(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct, num_blocks, block_len; - gchar *str = NULL; + const gchar *str = NULL; guint32 i, saved_offset; proto_tree *subtree; proto_item *item; @@ -1272,7 +1272,7 @@ static void msg_download_rsp(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct, num_blocks; - gchar *str = NULL; + const gchar *str = NULL; guint32 i, saved_offset; proto_tree *subtree; proto_item *item; @@ -1333,7 +1333,7 @@ static void msg_ms_key_rsp(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct; - gchar *str = NULL; + const gchar *str = NULL; guint32 saved_offset; EXACT_DATA_CHECK(len, 1); @@ -1357,7 +1357,7 @@ static void msg_key_gen_rsp(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct, result_len; - gchar *str = NULL; + const gchar *str = NULL; guint32 saved_offset; SHORT_DATA_CHECK(len, 2); @@ -1452,7 +1452,7 @@ static void msg_commit_rsp(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct; - gchar *str = NULL; + const gchar *str = NULL; guint32 saved_offset; EXACT_DATA_CHECK(len, 1); @@ -1476,7 +1476,7 @@ static void msg_protocap_rsp(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct, num_feat, add_len; - gchar *str = NULL; + const gchar *str = NULL; guint32 i, saved_offset; guint32 value; proto_tree *subtree; @@ -1612,7 +1612,7 @@ static void msg_sspr_config_rsp(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct, block_len; - gchar *str = NULL; + const gchar *str = NULL; guint32 saved_offset; SHORT_DATA_CHECK(len, 3); @@ -1670,7 +1670,7 @@ static void msg_sspr_download_rsp(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct; - gchar *str = NULL; + const gchar *str = NULL; guint32 saved_offset; guint32 value; @@ -1723,7 +1723,7 @@ static void msg_validate_rsp(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct, block_id, num_blocks; - gchar *str = NULL; + const gchar *str = NULL; guint32 i, saved_offset; proto_tree *subtree; proto_item *item; @@ -1784,7 +1784,7 @@ static void msg_otapa_rsp(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) { guint8 oct; - gchar *str = NULL; + const gchar *str = NULL; guint32 saved_offset; SHORT_DATA_CHECK(len, 2); diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c index 6277d1623a..54db5b633d 100644 --- a/epan/dissectors/packet-ansi_801.c +++ b/epan/dissectors/packet-ansi_801.c @@ -52,8 +52,8 @@ #include "epan/packet.h" -static char *ansi_proto_name = "ANSI IS-801 (Location Services (PLD))"; -static char *ansi_proto_name_short = "IS-801"; +static const char *ansi_proto_name = "ANSI IS-801 (Location Services (PLD))"; +static const char *ansi_proto_name_short = "IS-801"; #define ANSI_801_FORWARD 0 #define ANSI_801_REVERSE 1 @@ -530,7 +530,7 @@ dissect_ansi_801_for_message(tvbuff_t *tvb, proto_tree *tree) guint32 offset; guint8 oct, num_req, num_rsp; guint rem_len; - gchar *str = NULL; + const gchar *str = NULL; offset = 0; oct = tvb_get_guint8(tvb, offset); @@ -663,7 +663,7 @@ dissect_ansi_801_rev_message(tvbuff_t *tvb, proto_tree *tree) guint32 offset; guint8 oct, num_req, num_rsp; guint rem_len; - gchar *str = NULL; + const gchar *str = NULL; offset = 0; oct = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index 8b7d4fba66..e0917b23f4 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -285,7 +285,7 @@ static const value_string ansi_ms_info_rec_str[] = { #define NUM_MS_INFO_REC (sizeof(ansi_ms_info_rec_str)/sizeof(value_string)) static gint ett_ansi_ms_info_rec[NUM_MS_INFO_REC]; -static gchar *band_class_str[] = { +static const gchar *band_class_str[] = { "800 MHz Cellular System", "1.850 to 1.990 GHz Broadband PCS", "872 to 960 MHz TACS Band", @@ -302,7 +302,7 @@ static gchar *band_class_str[] = { }; #define NUM_BAND_CLASS_STR (sizeof(band_class_str)/sizeof(gchar *)) -static gchar *cell_disc_str[] = { +static const gchar *cell_disc_str[] = { "whole Cell Global Identification (CGI)", "LAC/CI", "Cell Identity (CI)", @@ -515,7 +515,7 @@ elem_chan_type(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar { guint8 oct; guint32 curr_offset; - gchar *str = NULL; + const gchar *str = NULL; gboolean data; curr_offset = offset; @@ -862,7 +862,7 @@ elem_enc_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar guint8 oct; guint8 oct_len; guint32 curr_offset; - gchar *str; + const gchar *str; guint8 num_recs; proto_tree *subtree; proto_item *item; @@ -973,7 +973,7 @@ elem_cm_info_type_2(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, guint8 num_bands; guint32 curr_offset; gint temp_int; - gchar *str; + const gchar *str; curr_offset = offset; @@ -1215,7 +1215,7 @@ elem_mid(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_ guint8 *poctets; guint32 value; guint32 curr_offset; - gchar *str; + const gchar *str; curr_offset = offset; @@ -1644,7 +1644,7 @@ elem_cause(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *ad guint8 oct; guint32 value; guint32 curr_offset; - gchar *str = NULL; + const gchar *str = NULL; curr_offset = offset; @@ -1884,7 +1884,7 @@ elem_cell_id(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar * { guint8 oct; guint32 curr_offset; - gchar *str = NULL; + const gchar *str = NULL; len = len; add_string = add_string; @@ -1929,7 +1929,7 @@ elem_cell_id_list(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gc guint32 curr_offset; proto_item *item = NULL; proto_tree *subtree = NULL; - gchar *str = NULL; + const gchar *str = NULL; curr_offset = offset; @@ -2036,7 +2036,7 @@ elem_cic_ext(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar * guint8 oct; guint32 value; guint32 curr_offset; - gchar *str; + const gchar *str; len = len; curr_offset = offset; @@ -2112,7 +2112,7 @@ elem_downlink_re(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gch guint32 curr_offset; proto_item *item = NULL; proto_tree *subtree = NULL; - gchar *str; + const gchar *str; curr_offset = offset; @@ -2416,7 +2416,7 @@ elem_is2000_chan_id(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, guint8 num_chan; guint32 value; guint32 curr_offset; - gchar *str; + const gchar *str; add_string = add_string; curr_offset = offset; @@ -2584,7 +2584,7 @@ elem_is95_ms_meas_chan_id(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint guint32 value; gint temp_int; guint32 curr_offset; - gchar *str; + const gchar *str; curr_offset = offset; @@ -2640,7 +2640,7 @@ elem_clg_party_ascii_num(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint guint8 oct; guint32 curr_offset; guint8 *poctets; - gchar *str; + const gchar *str; curr_offset = offset; @@ -2877,7 +2877,7 @@ elem_rej_cause(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar { guint8 oct; guint32 curr_offset; - gchar *str; + const gchar *str; len = len; curr_offset = offset; @@ -2934,7 +2934,7 @@ elem_auth_chlg_param(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, { guint8 oct; guint32 curr_offset; - gchar *str; + const gchar *str; curr_offset = offset; @@ -2988,7 +2988,7 @@ elem_auth_resp_param(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, { guint8 oct; guint32 curr_offset; - gchar *str; + const gchar *str; curr_offset = offset; @@ -3111,7 +3111,7 @@ elem_signal(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *a { guint8 oct; guint32 curr_offset; - gchar *str; + const gchar *str; len = len; curr_offset = offset; @@ -3201,7 +3201,7 @@ elem_cld_party_bcd_num(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le guint8 oct; guint8 *poctets; guint32 curr_offset; - gchar *str; + const gchar *str; curr_offset = offset; @@ -3287,7 +3287,7 @@ elem_clg_party_bcd_num(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le guint8 oct; guint8 *poctets; guint32 curr_offset; - gchar *str; + const gchar *str; curr_offset = offset; @@ -3457,7 +3457,7 @@ elem_cause_l3(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar { guint8 oct; guint32 curr_offset; - gchar *str = NULL; + const gchar *str = NULL; curr_offset = offset; @@ -3677,7 +3677,7 @@ elem_reg_type(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar { guint8 oct; guint32 curr_offset; - gchar *str; + const gchar *str; len = len; curr_offset = offset; @@ -3749,7 +3749,7 @@ elem_hho_params(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gcha guint8 oct; gint temp_int; guint32 curr_offset; - gchar *str; + const gchar *str; len = len; curr_offset = offset; @@ -3970,7 +3970,7 @@ elem_so(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_s { guint16 value; guint32 curr_offset; - gchar *str; + const gchar *str; len = len; curr_offset = offset; @@ -4115,7 +4115,7 @@ elem_adds_user_part(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, guint8 oct; guint8 adds_app; guint32 curr_offset; - gchar *str; + const gchar *str; tvbuff_t *adds_tvb; curr_offset = offset; @@ -4291,7 +4291,7 @@ elem_is2000_mob_cap(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, guint8 oct; guint8 oct_len; guint32 curr_offset; - gchar *str; + const gchar *str; add_string = add_string; curr_offset = offset; @@ -4450,7 +4450,7 @@ elem_ptype(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *ad { guint32 value; guint32 curr_offset; - gchar *str; + const gchar *str; curr_offset = offset; @@ -4969,7 +4969,7 @@ elem_cdma_sowd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar guint8 oct; guint32 value; guint32 curr_offset; - gchar *str = NULL; + const gchar *str = NULL; curr_offset = offset; @@ -5033,7 +5033,7 @@ elem_re_res(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *a { guint8 oct; guint32 curr_offset; - gchar *str; + const gchar *str; len = len; add_string = add_string; @@ -5228,7 +5228,7 @@ elem_cld_party_ascii_num(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint guint8 oct; guint32 curr_offset; guint8 *poctets; - gchar *str; + const gchar *str; curr_offset = offset; @@ -5308,7 +5308,7 @@ elem_band_class(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gcha guint8 oct; guint32 curr_offset; gint temp_int; - gchar *str; + const gchar *str; curr_offset = offset; @@ -5404,7 +5404,7 @@ elem_auth_event(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gcha { guint8 oct; guint32 curr_offset; - gchar *str; + const gchar *str; add_string = add_string; curr_offset = offset; @@ -5709,7 +5709,7 @@ elem_paca_order(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gcha { guint8 oct; guint32 curr_offset; - gchar *str; + const gchar *str; curr_offset = offset; @@ -5978,7 +5978,7 @@ static guint8 (*elem_1_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, g * Type Length Value (TLV) element dissector */ static guint8 -elem_tlv(tvbuff_t *tvb, proto_tree *tree, elem_idx_t idx, guint32 offset, guint len, gchar *name_add) +elem_tlv(tvbuff_t *tvb, proto_tree *tree, elem_idx_t idx, guint32 offset, guint len, const gchar *name_add) { guint8 oct, parm_len; guint8 consumed; @@ -6049,7 +6049,7 @@ elem_tlv(tvbuff_t *tvb, proto_tree *tree, elem_idx_t idx, guint32 offset, guint * is not defined for these. */ static guint8 -elem_tv(tvbuff_t *tvb, proto_tree *tree, elem_idx_t idx, guint32 offset, gchar *name_add) +elem_tv(tvbuff_t *tvb, proto_tree *tree, elem_idx_t idx, guint32 offset, const gchar *name_add) { guint8 oct; guint8 consumed; @@ -6112,7 +6112,7 @@ elem_tv(tvbuff_t *tvb, proto_tree *tree, elem_idx_t idx, guint32 offset, gchar * * is not defined for these. */ static guint8 -elem_t(tvbuff_t *tvb, proto_tree *tree, elem_idx_t idx, guint32 offset, gchar *name_add) +elem_t(tvbuff_t *tvb, proto_tree *tree, elem_idx_t idx, guint32 offset, const gchar *name_add) { guint8 oct; guint32 curr_offset; @@ -6140,7 +6140,7 @@ elem_t(tvbuff_t *tvb, proto_tree *tree, elem_idx_t idx, guint32 offset, gchar *n * Length Value (LV) element dissector */ static guint8 -elem_lv(tvbuff_t *tvb, proto_tree *tree, elem_idx_t idx, guint32 offset, guint len, gchar *name_add) +elem_lv(tvbuff_t *tvb, proto_tree *tree, elem_idx_t idx, guint32 offset, guint len _U_, const gchar *name_add) { guint8 parm_len; guint8 consumed; @@ -6148,7 +6148,6 @@ elem_lv(tvbuff_t *tvb, proto_tree *tree, elem_idx_t idx, guint32 offset, guint l proto_tree *subtree; proto_item *item; - len = len; curr_offset = offset; consumed = 0; @@ -6361,7 +6360,7 @@ dtap_cm_srvc_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) guint8 oct; proto_tree *subtree; proto_item *item; - gchar *str; + const gchar *str; curr_offset = offset; curr_len = len; @@ -8032,7 +8031,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *oct_1_item = NULL; proto_tree *oct_1_tree = NULL; const gchar *msg_str; - gchar *str; + const gchar *str; len = tvb_length(tvb); diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index f2628cef62..15386dc6f9 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -589,7 +589,7 @@ static const value_string ansi_tele_strings[] = { }; #define NUM_BAND_CLASS_STR (sizeof(band_class_str)/sizeof(gchar *)) -static gchar *band_class_str[] = { +static const gchar *band_class_str[] = { "800 MHz Cellular System", "1.850 to 1.990 GHz Broadband PCS", "872 to 960 MHz TACS Band", @@ -606,7 +606,7 @@ static gchar *band_class_str[] = { }; #define NUM_QOS_PRI_STR (sizeof(qos_pri_str)/sizeof(gchar *)) -static gchar *qos_pri_str[] = { +static const gchar *qos_pri_str[] = { "Priority Level 0. This is the lowest level", "Priority Level 1", "Priority Level 2", @@ -776,14 +776,13 @@ my_dgt_tbcd_unpack( } static void -param_mscid(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_mscid(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 market_id, switch_num; guint saved_offset; EXACT_DATA_CHECK(len, 3); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 2, &market_id); @@ -796,13 +795,12 @@ param_mscid(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_page_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_page_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -826,15 +824,14 @@ param_page_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_srvc_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_srvc_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -861,15 +858,14 @@ param_srvc_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_sme_report(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sme_report(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -895,15 +891,14 @@ param_sme_report(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_alert_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_alert_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -950,7 +945,6 @@ param_alert_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) bigbuf, str); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -981,13 +975,12 @@ param_alert_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_term_acc_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_term_acc_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1014,13 +1007,12 @@ param_term_acc_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_stri } static void -param_term_treat(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_term_treat(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1046,15 +1038,14 @@ param_term_treat(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_term_trig(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_term_trig(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1119,7 +1110,6 @@ param_term_trig(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) bigbuf, str); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1141,12 +1131,11 @@ param_term_trig(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_aav(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_aav(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1160,15 +1149,14 @@ param_aav(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_ann_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_ann_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 3); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1355,13 +1343,12 @@ param_ann_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_alert_res(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_alert_res(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1388,13 +1375,12 @@ param_alert_res(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_conf_call_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_conf_call_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1418,13 +1404,12 @@ param_conf_call_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_stri } static void -param_count_upd_report(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_count_upd_report(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1449,13 +1434,12 @@ param_count_upd_report(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_s } static void -param_ssd_upd_report(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_ssd_upd_report(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1481,15 +1465,14 @@ param_ssd_upd_report(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_cond_den_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cond_den_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1510,15 +1493,14 @@ param_cond_den_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_st } static void -param_den_auth_per(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_den_auth_per(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1558,12 +1540,11 @@ param_den_auth_per(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_strin } static void -param_ho_state(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_ho_state(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1585,13 +1566,12 @@ param_ho_state(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_geo_auth(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_geo_auth(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1619,13 +1599,12 @@ param_geo_auth(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_mw_noti_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_mw_noti_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1669,13 +1648,12 @@ param_mw_noti_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_strin } static void -param_paca_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_paca_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -1724,14 +1702,13 @@ param_paca_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_digit_collect_ctrl(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_digit_collect_ctrl(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; proto_item *item; proto_tree *subtree; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -2379,12 +2356,11 @@ param_digit_collect_ctrl(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add } static void -param_no_ans_time(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_no_ans_time(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -2398,15 +2374,14 @@ param_no_ans_time(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string } static void -param_mw_noti_count(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_mw_noti_count(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset, orig_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 2); - add_string = add_string; orig_offset = asn1->offset; saved_offset = asn1->offset; @@ -2457,13 +2432,12 @@ param_mw_noti_count(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_stri } static void -param_otfi(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_otfi(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -2595,14 +2569,13 @@ param_otfi(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) * Authentication Response Unique Challenge */ static void -param_auth_resp_all(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_auth_resp_all(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 3); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -2664,7 +2637,7 @@ param_bill_id(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) { gint32 id, segcount; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 7); @@ -2692,15 +2665,14 @@ param_bill_id(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_cdma_so(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_so(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 so; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 2, &so); @@ -2803,13 +2775,12 @@ param_cdma_so(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_tdma_sc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_tdma_sc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -2838,15 +2809,14 @@ param_tdma_sc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_dmh_red_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_dmh_red_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 redind; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &redind); @@ -2897,14 +2867,13 @@ param_dmh_red_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string } static void -param_cic(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cic(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 tg, mem; guint saved_offset; EXACT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &tg); @@ -2919,15 +2888,14 @@ param_cic(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_qic(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_qic(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 qic; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &qic); @@ -2957,15 +2925,14 @@ param_qic(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_feat_result(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_feat_result(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -2988,7 +2955,7 @@ param_feat_result(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string str); } -gchar *calling_feat_ind_str[] = { +const gchar *calling_feat_ind_str[] = { "Not used", "Not authorized", "Authorized but de-activated", @@ -2996,14 +2963,13 @@ gchar *calling_feat_ind_str[] = { }; static void -param_calling_feat_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_calling_feat_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; SHORT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -3193,15 +3159,14 @@ param_calling_feat_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_s } static void -param_usage_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_usage_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -3223,7 +3188,7 @@ param_usage_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) value); } -gchar *tdma_data_feat_ind_str[] = { +const gchar *tdma_data_feat_ind_str[] = { "Not used", "Not authorized", "Authorized but de-activated", @@ -3231,14 +3196,13 @@ gchar *tdma_data_feat_ind_str[] = { }; static void -param_tdma_data_feat_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_tdma_data_feat_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; SHORT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -3306,14 +3270,13 @@ param_tdma_data_feat_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add } static void -param_faulty(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_faulty(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; const gchar *str = NULL; gint idx; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -3377,15 +3340,14 @@ param_faulty(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_sys_type_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sys_type_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 sys_type_code; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &sys_type_code); @@ -3443,11 +3405,10 @@ param_ext_sys_type_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_ { gint32 type; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &type); @@ -3480,14 +3441,13 @@ param_ext_sys_type_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_ } static void -param_cdma_sea_win(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_sea_win(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -3507,14 +3467,13 @@ param_cdma_sea_win(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_strin } static void -param_cdma_sea_param(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_sea_param(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; SHORT_DATA_CHECK(len, 4); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -3588,12 +3547,11 @@ param_cdma_sea_param(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_cdma_code_chan(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_code_chan(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -3615,15 +3573,14 @@ param_cdma_code_chan(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 3); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -3677,14 +3634,13 @@ param_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_cdma_plcm(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_plcm(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 6); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -3711,14 +3667,13 @@ param_cdma_plcm(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_ctrl_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_ctrl_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 4); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -3774,15 +3729,14 @@ param_ctrl_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_cdma_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value, temp_int; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 8); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 2, &value); @@ -3928,13 +3882,12 @@ param_cdma_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_namps_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_namps_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -3983,15 +3936,14 @@ param_namps_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_st } static void -param_cdma_ms_meas_chan_id(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_ms_meas_chan_id(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value, temp_int; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 2, &value); @@ -4030,15 +3982,14 @@ param_cdma_ms_meas_chan_id(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *a } static void -param_tdma_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_tdma_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 5); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4134,12 +4085,11 @@ param_tdma_chan_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_tdma_call_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_tdma_call_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4196,12 +4146,11 @@ param_tdma_call_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_cdma_call_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_call_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4326,12 +4275,11 @@ param_cdma_call_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_namps_call_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_namps_call_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4366,12 +4314,11 @@ param_namps_call_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_st } static void -param_mob_rev(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_mob_rev(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4385,13 +4332,12 @@ param_mob_rev(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_cdma_band_class(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_band_class(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value, temp_int; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4423,15 +4369,14 @@ param_cdma_band_class(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_st } static void -param_calling_party_name(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_calling_party_name(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4482,15 +4427,14 @@ param_calling_party_name(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add } static void -param_red_party_name(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_red_party_name(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4541,11 +4485,8 @@ param_red_party_name(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_srvc_id(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_srvc_id(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { - - add_string = add_string; - proto_tree_add_text(tree, asn1->tvb, asn1->offset, len, "Service Identifier (Spec. does not define clearly)"); @@ -4554,15 +4495,14 @@ param_srvc_id(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_all_or_none(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_all_or_none(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4584,15 +4524,14 @@ param_all_or_none(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string } static void -param_change(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_change(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4616,15 +4555,14 @@ param_change(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_data_result(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_data_result(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4649,13 +4587,12 @@ param_data_result(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string } static void -param_fail_cause(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_fail_cause(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { guint saved_offset; SHORT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; proto_tree_add_text(tree, asn1->tvb, @@ -4666,15 +4603,14 @@ param_fail_cause(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_fail_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_fail_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4698,15 +4634,14 @@ param_fail_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_resume_pic(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_resume_pic(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4747,13 +4682,12 @@ param_resume_pic(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_special_rsc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_special_rsc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value, i; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; i = 0; @@ -4786,14 +4720,13 @@ param_special_rsc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string } static void -param_time_date_offset(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_time_date_offset(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 2, &value); @@ -4805,16 +4738,15 @@ param_time_date_offset(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_s } static void -param_network_tmsi(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_network_tmsi(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value, addr_type, first_dig; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; guchar *poctets; SHORT_DATA_CHECK(len, 4); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 4, &value); @@ -4876,12 +4808,11 @@ param_network_tmsi(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_strin } static void -param_reqd_param_mask(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_reqd_param_mask(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4931,13 +4862,12 @@ param_reqd_param_mask(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_st } static void -param_srvc_red_cause(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_srvc_red_cause(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4965,12 +4895,11 @@ param_srvc_red_cause(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_srvc_red_info(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_srvc_red_info(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -4999,13 +4928,12 @@ param_srvc_red_info(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_stri } static void -param_roaming_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_roaming_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5040,14 +4968,13 @@ param_roaming_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string } static void -param_cdma_pci(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_pci(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5066,14 +4993,13 @@ param_cdma_pci(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_cdma_chan_num(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_chan_num(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; SHORT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 2, &value); @@ -5101,14 +5027,13 @@ param_cdma_chan_num(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_stri } static void -param_cdma_sci(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_sci(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5128,15 +5053,14 @@ param_cdma_sci(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_vp_report(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_vp_report(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5162,13 +5086,12 @@ param_vp_report(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_cdma_scm(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_scm(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5225,13 +5148,12 @@ param_cdma_scm(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_ota_result_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_ota_result_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5261,12 +5183,11 @@ param_ota_result_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_st } static void -param_cdma_scm2(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_scm2(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5280,15 +5201,14 @@ param_cdma_scm2(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_tdma_term_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_tdma_term_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 4); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5460,15 +5380,14 @@ param_tdma_term_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_stri } static void -param_tdma_voice_coder(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_tdma_voice_coder(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value, vc; guint orig_offset, saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 2); - add_string = add_string; orig_offset = asn1->offset; saved_offset = asn1->offset; @@ -5509,14 +5428,13 @@ param_tdma_voice_coder(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_s } static void -param_cdma_pilot_pn(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_pilot_pn(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; SHORT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 2, &value); @@ -5543,14 +5461,13 @@ param_cdma_pilot_pn(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_stri } static void -param_cdma_pilot_strength(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_pilot_strength(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5570,15 +5487,14 @@ param_cdma_pilot_strength(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *ad } static void -param_trunk_stat(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_trunk_stat(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5600,13 +5516,12 @@ param_trunk_stat(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_pref_lang_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_pref_lang_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5633,13 +5548,12 @@ param_pref_lang_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_stri } static void -param_rand_valtime(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_rand_valtime(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5662,15 +5576,14 @@ param_rand_valtime(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_strin } static void -param_tdma_burst_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_tdma_burst_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5705,15 +5618,14 @@ param_tdma_burst_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_orig_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_orig_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5742,14 +5654,13 @@ param_orig_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_ms_loc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_ms_loc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; SHORT_DATA_CHECK(len, 7); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 3, &value); @@ -5781,13 +5692,12 @@ param_ms_loc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_unique_chal_rep(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_unique_chal_rep(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5813,13 +5723,12 @@ param_unique_chal_rep(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_st } static void -param_rand_unique(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_rand_unique(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { guint saved_offset; EXACT_DATA_CHECK(len, 3); - add_string = add_string; saved_offset = asn1->offset; proto_tree_add_text(tree, asn1->tvb, @@ -5830,14 +5739,13 @@ param_rand_unique(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string } static void -param_vpmask(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_vpmask(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 66); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5888,13 +5796,12 @@ param_vpmask(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_ssd(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_ssd(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { guint saved_offset; EXACT_DATA_CHECK(len, 16); - add_string = add_string; saved_offset = asn1->offset; proto_tree_add_text(tree, asn1->tvb, @@ -5909,15 +5816,14 @@ param_ssd(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_upd_count(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_upd_count(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -5939,13 +5845,12 @@ param_upd_count(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_sme_key(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sme_key(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { guint saved_offset; EXACT_DATA_CHECK(len, 8); - add_string = add_string; saved_offset = asn1->offset; proto_tree_add_text(tree, asn1->tvb, @@ -5956,13 +5861,12 @@ param_sme_key(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_rand_ssd(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_rand_ssd(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { guint saved_offset; EXACT_DATA_CHECK(len, 7); - add_string = add_string; saved_offset = asn1->offset; proto_tree_add_text(tree, asn1->tvb, @@ -5973,13 +5877,12 @@ param_rand_ssd(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_setup_result(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_setup_result(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6002,11 +5905,10 @@ param_setup_result(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_strin } static void -param_randc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_randc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; proto_tree_add_text(tree, asn1->tvb, @@ -6023,7 +5925,7 @@ param_ext_mscid(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) { gint32 type; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 4); @@ -6059,13 +5961,12 @@ param_ext_mscid(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_sub_addr(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sub_addr(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6110,18 +6011,17 @@ param_sub_addr(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_digits(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_digits(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value, b1, b2, b3, b4, enc, plan; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; proto_item *item; proto_tree *subtree; guchar *poctets; SHORT_DATA_CHECK(len, 4); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6304,14 +6204,13 @@ param_digits(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_esn(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_esn(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 4); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 4, &value); @@ -6325,13 +6224,12 @@ param_esn(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_sms_noti(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sms_noti(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6358,13 +6256,12 @@ param_sms_noti(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_sms_orig_restric(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sms_orig_restric(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6423,13 +6320,12 @@ param_sms_orig_restric(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_s } static void -param_seizure(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_seizure(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6452,7 +6348,7 @@ param_seizure(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_sms_tele(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sms_tele(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; @@ -6462,7 +6358,6 @@ param_sms_tele(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) SHORT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 2, &value); @@ -6497,13 +6392,12 @@ param_sms_tele(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_sms_term_restric(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sms_term_restric(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6548,13 +6442,12 @@ param_sms_term_restric(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_s } static void -param_sms_msg_count(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sms_msg_count(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6576,13 +6469,12 @@ param_sms_msg_count(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_stri } static void -param_qos_pri(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_qos_pri(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value, temp_int; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6625,14 +6517,13 @@ param_qos_pri(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_calling_party_cat(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_calling_party_cat(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6646,7 +6537,7 @@ param_calling_party_cat(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_ * Dissect IOS data parameters expected to be in TLV format */ static void -dissect_cdma2000_ios_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +dissect_cdma2000_ios_data(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint num_elems; @@ -6715,13 +6606,12 @@ param_cdma2000_ho_rsp_ios(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *ad } static void -param_msid_usage(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_msid_usage(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6751,15 +6641,14 @@ param_msid_usage(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_new_min_ext(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_new_min_ext(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 3); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6819,13 +6708,12 @@ param_new_min_ext(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string } static void -param_dtx_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_dtx_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6853,13 +6741,12 @@ param_dtx_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_cdma_mob_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_mob_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6887,7 +6774,7 @@ param_cdma_mob_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_strin } static void -param_gen_time(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_gen_time(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; gint32 h, m, s, ts; @@ -6895,7 +6782,6 @@ param_gen_time(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) SHORT_DATA_CHECK(len, 6); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -6945,11 +6831,10 @@ param_gen_time(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_geo_pos(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_geo_pos(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; proto_tree_add_text(tree, asn1->tvb, @@ -6958,13 +6843,12 @@ param_geo_pos(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_mob_call_status(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_mob_call_status(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value, auth; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7015,13 +6899,12 @@ param_mob_call_status(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_st } static void -param_pos_req_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_pos_req_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7048,13 +6931,12 @@ param_pos_req_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_strin } static void -param_pos_result(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_pos_result(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7096,13 +6978,12 @@ param_pos_result(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_pos_source(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_pos_source(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7139,15 +7020,14 @@ param_pos_source(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_acg_encounter(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_acg_encounter(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7199,15 +7079,14 @@ param_acg_encounter(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_stri } static void -param_ctrl_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_ctrl_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7259,15 +7138,14 @@ param_ctrl_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_gap_duration(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_gap_duration(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7299,15 +7177,14 @@ param_gap_duration(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_strin } static void -param_scf_overload_gap_int(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_scf_overload_gap_int(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7347,12 +7224,11 @@ param_scf_overload_gap_int(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *a } static void -param_tdma_time_align(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_tdma_time_align(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7375,11 +7251,11 @@ param_tdma_time_align(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_st } static void -dump_rssi(ASN1_SCK *asn1, proto_tree *tree, gchar *leader) +dump_rssi(ASN1_SCK *asn1, proto_tree *tree, const gchar *leader) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; saved_offset = asn1->offset; @@ -7646,15 +7522,14 @@ param_tdma_maho_chan(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_tdma_maho_req(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_tdma_maho_req(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7674,15 +7549,14 @@ param_tdma_maho_req(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_stri } static void -param_sm_gap_int(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sm_gap_int(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7716,13 +7590,11 @@ param_sm_gap_int(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_mob_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_mob_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset, i; - gchar *str = NULL; - - add_string = add_string; + const gchar *str = NULL; for (i=0; i < len; i++) { @@ -7762,14 +7634,13 @@ param_mob_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_cdma_psmm_count(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_psmm_count(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7781,15 +7652,14 @@ param_cdma_psmm_count(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_st } static void -param_cdma_sowd2(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_sowd2(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 5); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 2, &value); @@ -7837,13 +7707,12 @@ param_cdma_sowd2(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_sms_charge_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sms_charge_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7869,15 +7738,14 @@ param_sms_charge_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_auth_per(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_auth_per(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7915,13 +7783,12 @@ param_auth_per(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_ctrl_chan_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_ctrl_chan_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -7946,15 +7813,14 @@ param_ctrl_chan_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_tdma_data_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_tdma_data_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -8048,13 +7914,12 @@ param_tdma_data_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_tdma_voice_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_tdma_voice_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -8100,13 +7965,12 @@ param_tdma_voice_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_st } static void -param_tdma_bandwidth(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_tdma_bandwidth(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -8141,13 +8005,12 @@ param_tdma_bandwidth(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_change_srvc_attr(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_change_srvc_attr(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -8192,15 +8055,14 @@ param_change_srvc_attr(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_s } static void -param_dp_params(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_dp_params(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 4); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -8256,12 +8118,11 @@ param_dp_params(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_trn(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_trn(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { guint saved_offset; guchar *poctets; - add_string = add_string; saved_offset = asn1->offset; asn1_string_value_decode(asn1, len, &poctets); @@ -8274,13 +8135,12 @@ param_trn(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_islp_info(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_islp_info(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -8305,13 +8165,12 @@ param_islp_info(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_ana_red_info(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_ana_red_info(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -8355,14 +8214,13 @@ param_ana_red_info(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_strin } static void -param_reason_list(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_reason_list(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; gint i; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; i = 0; @@ -8402,12 +8260,11 @@ param_reason_list(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string } static void -param_imsi(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_imsi(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { guint saved_offset; guchar *poctets; - add_string = add_string; saved_offset = asn1->offset; asn1_string_value_decode(asn1, len, &poctets); @@ -8423,14 +8280,13 @@ param_imsi(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_min(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_min(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { guint saved_offset; guchar *poctets; EXACT_DATA_CHECK(len, 5); - add_string = add_string; saved_offset = asn1->offset; asn1_string_value_decode(asn1, len, &poctets); @@ -8446,15 +8302,14 @@ param_min(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_auth_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_auth_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -8479,15 +8334,14 @@ param_auth_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_sus_acc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sus_acc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -8511,14 +8365,13 @@ param_sus_acc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_dis_text(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_dis_text(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; SHORT_DATA_CHECK(len, 3); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -8545,16 +8398,14 @@ param_dis_text(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_dis_text2(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_dis_text2(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint orig_offset, saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 4); - add_string = add_string; - orig_offset = asn1->offset; saved_offset = asn1->offset; @@ -8641,15 +8492,13 @@ param_dis_text2(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_dmh_srvc_id(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_dmh_srvc_id(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint orig_offset, saved_offset; SHORT_DATA_CHECK(len, 5); - add_string = add_string; - orig_offset = asn1->offset; saved_offset = asn1->offset; @@ -8688,15 +8537,13 @@ param_dmh_srvc_id(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string } static void -param_feat_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_feat_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint orig_offset, saved_offset; SHORT_DATA_CHECK(len, 5); - add_string = add_string; - orig_offset = asn1->offset; saved_offset = asn1->offset; @@ -8735,14 +8582,13 @@ param_feat_ind(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_a_key_ver(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_a_key_ver(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; gint i; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; i = 0; @@ -8776,14 +8622,13 @@ param_a_key_ver(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_inter_msg_time(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_inter_msg_time(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -8798,15 +8643,14 @@ param_inter_msg_time(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_str } static void -param_rel_cause(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_rel_cause(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -8835,7 +8679,7 @@ param_rel_cause(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_time_day(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_time_day(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; gint32 h, m, s, ts; @@ -8843,7 +8687,6 @@ param_time_day(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) EXACT_DATA_CHECK(len, 3); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 3, &value); @@ -8864,13 +8707,11 @@ param_time_day(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_call_status(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_call_status(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; - - add_string = add_string; + const gchar *str = NULL; if (len > 4) { @@ -8903,15 +8744,14 @@ param_call_status(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string } static void -param_ms_status(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_ms_status(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; gboolean has_chan; gboolean extended; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9020,12 +8860,11 @@ param_ms_status(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_pos_info_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_pos_info_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9075,15 +8914,14 @@ param_pos_info_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_stri } static void -param_rel_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_rel_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9117,15 +8955,14 @@ param_rel_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_ho_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_ho_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9149,15 +8986,14 @@ param_ho_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_red_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_red_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9188,14 +9024,13 @@ param_red_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_confid_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_confid_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9229,15 +9064,14 @@ param_confid_mode(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string } static void -param_sys_acc_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sys_acc_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9266,15 +9100,14 @@ param_sys_acc_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_strin } static void -param_scm(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_scm(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value, temp_int; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9321,15 +9154,14 @@ param_scm(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_deny_acc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_deny_acc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9359,14 +9191,13 @@ param_deny_acc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_cdma_sig_qual(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_sig_qual(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9386,15 +9217,14 @@ param_cdma_sig_qual(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_stri } static void -param_rec_sig_qual(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_rec_sig_qual(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9416,15 +9246,14 @@ param_rec_sig_qual(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_strin } static void -param_sig_qual(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sig_qual(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9446,15 +9275,14 @@ param_sig_qual(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_ssd_no_share(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_ssd_no_share(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9474,15 +9302,14 @@ param_ssd_no_share(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_strin } static void -param_report_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_report_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9518,15 +9345,14 @@ param_report_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string } static void -param_term_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_term_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9566,15 +9392,14 @@ param_term_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_term_res(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_term_res(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9597,15 +9422,14 @@ param_term_res(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_dereg(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_dereg(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9628,14 +9452,13 @@ param_dereg(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_group_info(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_group_info(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; SHORT_DATA_CHECK(len, 4); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 4, &value); @@ -9649,15 +9472,14 @@ param_group_info(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_auth_den(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_auth_den(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9688,10 +9510,10 @@ param_auth_den(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) value); } -static gchar * +static const gchar * find_trig_type(gint32 value) { - gchar *str = NULL; + const gchar *str = NULL; switch (value) { @@ -9761,14 +9583,13 @@ find_trig_type(gint32 value) } static void -param_trig_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_trig_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9781,13 +9602,12 @@ param_trig_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_win_op_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_win_op_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -9844,12 +9664,11 @@ param_win_op_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_win_trig_list(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_win_trig_list(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value, i, j; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; j = 0; @@ -9911,14 +9730,13 @@ param_win_trig_list(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_stri } static void -param_trans_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_trans_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; char *p; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -10147,15 +9965,14 @@ param_trans_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_spini_trig(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_spini_trig(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 4); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -10588,15 +10405,14 @@ param_spini_trig(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_orig_trig(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_orig_trig(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; SHORT_DATA_CHECK(len, 4); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -11029,13 +10845,12 @@ param_orig_trig(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_trig_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_trig_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -11356,15 +11171,14 @@ param_trig_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_sys_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sys_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -11461,13 +11275,12 @@ param_sys_cap(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_act_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_act_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -11514,15 +11327,14 @@ param_act_code(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_border_acc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_border_acc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -11545,13 +11357,12 @@ param_border_acc(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_avail_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_avail_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -11574,13 +11385,12 @@ param_avail_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_can_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_can_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -11605,15 +11415,14 @@ param_can_type(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_can_den(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_can_den(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -11637,15 +11446,14 @@ param_can_den(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_acc_den(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_acc_den(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 1); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -11678,13 +11486,12 @@ param_acc_den(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_sms_acc_den_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sms_acc_den_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -11714,12 +11521,10 @@ param_sms_acc_den_reason(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add } static void -param_sms_bd(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sms_bd(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { tvbuff_t *next_tvb; - add_string = add_string; - next_tvb = tvb_new_subset(asn1->tvb, asn1->offset, len, len); if (ansi_map_sms_tele_id != -1) @@ -11744,13 +11549,12 @@ param_sms_bd(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_sms_cause(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_sms_cause(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -11809,12 +11613,11 @@ param_sms_cause(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_cdma_soci(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_cdma_soci(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -11828,13 +11631,11 @@ param_cdma_soci(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_int(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_int(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; - add_string = add_string; - if (len > 4) { proto_tree_add_text(tree, asn1->tvb, @@ -11854,15 +11655,14 @@ param_int(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_pc_ssn(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_pc_ssn(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value, b1, b2, b3, b4; guint saved_offset; - gchar *str = NULL; + const gchar *str = NULL; EXACT_DATA_CHECK(len, 5); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 1, &value); @@ -11903,14 +11703,13 @@ param_pc_ssn(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_lai(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_lai(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { gint32 value; guint saved_offset; EXACT_DATA_CHECK(len, 2); - add_string = add_string; saved_offset = asn1->offset; asn1_int32_value_decode(asn1, 2, &value); @@ -11923,12 +11722,11 @@ param_lai(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) } static void -param_list(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) +param_list(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) { guint saved_offset; guint num_parms; - add_string = add_string; num_parms = 0; saved_offset = asn1->offset; @@ -11953,7 +11751,7 @@ param_list(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) #define NUM_PARAM_1 (sizeof(ansi_param_1_strings)/sizeof(value_string)) static gint ett_ansi_param_1[NUM_PARAM_1]; -static void (*param_1_fcn[])(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) = { +static void (*param_1_fcn[])(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) = { param_bill_id, /* Billing ID */ param_int, /* Serving Cell ID */ param_int, /* Target Cell ID */ @@ -11990,7 +11788,7 @@ static void (*param_1_fcn[])(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar #define NUM_PARAM_2 (sizeof(ansi_param_2_strings)/sizeof(value_string)) static gint ett_ansi_param_2[NUM_PARAM_2]; -static void (*param_2_fcn[])(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) = { +static void (*param_2_fcn[])(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) = { param_tdma_burst_ind, /* TDMA Burst Indicator */ param_pc_ssn, /* PC_SSN */ param_lai, /* Location Area ID */ @@ -12091,7 +11889,7 @@ static void (*param_2_fcn[])(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar #define NUM_PARAM_3 (sizeof(ansi_param_3_strings)/sizeof(value_string)) static gint ett_ansi_param_3[NUM_PARAM_3]; -static void (*param_3_fcn[])(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) = { +static void (*param_3_fcn[])(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) = { param_act_code, /* Action Code */ param_alert_res, /* Alert Result */ param_list, /* Announcement List */ @@ -12337,7 +12135,7 @@ check_ansi_map_tag(ASN1_SCK *asn1, guint tag) } static void -dissect_ansi_map_octet(ASN1_SCK *asn1, proto_tree *tree, guchar * str) +dissect_ansi_map_octet(ASN1_SCK *asn1, proto_tree *tree, const guchar * str) { guint saved_offset; guchar my_oct; @@ -12472,8 +12270,8 @@ dissect_ansi_problem(ASN1_SCK *asn1, proto_tree *tree) guint tag; proto_tree *subtree; proto_item *item = NULL; - gchar *str = NULL; - gchar *type_str = NULL; + const gchar *str = NULL; + const gchar *type_str = NULL; gint32 type, spec; gboolean def_len; @@ -12616,7 +12414,7 @@ dissect_ansi_error(ASN1_SCK *asn1, proto_tree *tree) gint32 value; proto_tree *subtree; proto_item *item = NULL; - gchar *str = NULL; + const gchar *str = NULL; gboolean def_len; @@ -12693,7 +12491,7 @@ dissect_ansi_error(ASN1_SCK *asn1, proto_tree *tree) static gboolean dissect_ansi_param(ASN1_SCK *asn1, proto_tree *tree) { - void (*param_fcn)(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string) = NULL; + void (*param_fcn)(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_) = NULL; guint saved_offset = 0; guint len; proto_tree *subtree; @@ -12808,7 +12606,7 @@ dissect_ansi_params(ASN1_SCK *asn1, proto_tree *tree) guint tag; proto_tree *subtree; proto_item *item = NULL; - gchar *str = NULL; + const gchar *str = NULL; gboolean def_len; #define TCAP_PARAM_SET_TAG 0xf2 diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 504701d67c..3995fd0ac5 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -140,7 +140,7 @@ static const value_string atmop_vals[] = { #define ARP_PRO_IS_IPv4(ar_pro, ar_pln) \ ((ar_pro) == ETHERTYPE_IP && (ar_pln) == 4) -gchar * +const gchar * arphrdaddr_to_str(const guint8 *ad, int ad_len, guint16 type) { if (ad_len == 0) @@ -153,7 +153,7 @@ arphrdaddr_to_str(const guint8 *ad, int ad_len, guint16 type) return bytes_to_str(ad, ad_len); } -static gchar * +static const gchar * arpproaddr_to_str(const guint8 *ad, int ad_len, guint16 type) { if (ad_len == 0) @@ -168,7 +168,7 @@ arpproaddr_to_str(const guint8 *ad, int ad_len, guint16 type) #define N_ATMARPNUM_TO_STR_STRINGS 2 #define MAX_E164_STR_LEN 20 -static gchar * +static const gchar * atmarpnum_to_str(const guint8 *ad, int ad_tl) { int ad_len = ad_tl & ATMARP_LEN_MASK; @@ -206,7 +206,7 @@ atmarpnum_to_str(const guint8 *ad, int ad_tl) } } -static gchar * +static const gchar * atmarpsubaddr_to_str(const guint8 *ad, int ad_tl) { int ad_len = ad_tl & ATMARP_LEN_MASK; @@ -394,8 +394,8 @@ dissect_atmarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int tha_offset, tsa_offset, tpa_offset; const guint8 *sha_val, *ssa_val, *spa_val; const guint8 *tha_val, *tsa_val, *tpa_val; - gchar *sha_str, *ssa_str, *spa_str; - gchar *tha_str, *tsa_str, *tpa_str; + const gchar *sha_str, *ssa_str, *spa_str; + const gchar *tha_str, *tsa_str, *tpa_str; proto_tree *tl_tree; proto_item *tl; diff --git a/epan/dissectors/packet-arp.h b/epan/dissectors/packet-arp.h index 808cb83447..721c024d9e 100644 --- a/epan/dissectors/packet-arp.h +++ b/epan/dissectors/packet-arp.h @@ -26,7 +26,7 @@ #ifndef __PACKET_ARP_H__ #define __PACKET_ARP_H__ -gchar *arphrdaddr_to_str(const guint8 *ad, int ad_len, guint16 type); +const gchar *arphrdaddr_to_str(const guint8 *ad, int ad_len, guint16 type); const gchar *arphrdtype_to_str(guint16 hwtype, const char *fmt); void dissect_atm_nsap(tvbuff_t *tvb, int offset, int len, proto_tree *tree); |