forked from osmocom/wireshark
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
This commit is contained in:
Jörg Mayer
parent
440cf5767f
commit
b8d33c4add
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue