osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

More char -> const char warning fixes 

svn path=/trunk/; revision=15218
This commit is contained in:
Jörg Mayer 2005-08-05 00:23:22 +00:00
parent 63728d5770
commit 69dcb66cd9
34 changed files with 86 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-gssapi.c
View File

@ -80,8 +80,8 @@ gssapi_oid_hash(gconstpointer k)
}
void
gssapi_init_oid(char *oid, int proto, int ett, dissector_handle_t handle,
dissector_handle_t wrap_handle, gchar *comment)
gssapi_init_oid(const char *oid, int proto, int ett, dissector_handle_t handle,
dissector_handle_t wrap_handle, const gchar *comment)
{
char *key = g_strdup(oid);
gssapi_oid_value *value = g_malloc(sizeof(*value));

6
epan/dissectors/packet-gssapi.h
View File

@ -33,14 +33,14 @@ typedef struct _gssapi_oid_value {
int ett;
dissector_handle_t handle;
dissector_handle_t wrap_handle;
gchar *comment; /* For the comment */
const gchar *comment; /* For the comment */
} gssapi_oid_value;
/* Function prototypes */
void
gssapi_init_oid(char *oid, int proto, int ett, dissector_handle_t handle,
dissector_handle_t wrap_handle, gchar *comment);
gssapi_init_oid(const char *oid, int proto, int ett, dissector_handle_t handle,
dissector_handle_t wrap_handle, const gchar *comment);
gssapi_oid_value *
gssapi_lookup_oid_str(gchar *oid_key);

34
epan/dissectors/packet-ncp2222.inc
View File

@ -1035,41 +1035,41 @@ typedef struct {
guint8 vtype;
guint32 vvalue;
char* vstring;
char* vdesc;
const char* vdesc;
guint32 vlength;
guint32 voffset;
guint32 hfname;
char* bit1;
const char* bit1;
guint32 bit1hfname;
char* bit2;
const char* bit2;
guint32 bit2hfname;
char* bit3;
const char* bit3;
guint32 bit3hfname;
char* bit4;
const char* bit4;
guint32 bit4hfname;
char* bit5;
const char* bit5;
guint32 bit5hfname;
char* bit6;
const char* bit6;
guint32 bit6hfname;
char* bit7;
const char* bit7;
guint32 bit7hfname;
char* bit8;
const char* bit8;
guint32 bit8hfname;
char* bit9;
const char* bit9;
guint32 bit9hfname;
char* bit10;
const char* bit10;
guint32 bit10hfname;
char* bit11;
const char* bit11;
guint32 bit11hfname;
char* bit12;
const char* bit12;
guint32 bit12hfname;
char* bit13;
const char* bit13;
guint32 bit13hfname;
char* bit14;
const char* bit14;
guint32 bit14hfname;
char* bit15;
const char* bit15;
guint32 bit15hfname;
char* bit16;
const char* bit16;
guint32 bit16hfname;
guint8 mvtype;
guint32 vflags;

2
epan/dissectors/packet-ndmp.c
View File

@ -1126,7 +1126,7 @@ dissect_execute_cdb_cdb(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int
dissect_execute_cdb_payload(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree,
char *name, int hf_len, gboolean isreq)
const char *name, int hf_len, gboolean isreq)
{
proto_item* item = NULL;
proto_tree* tree = NULL;

10
epan/dissectors/packet-nlsp.c
View File

@ -121,10 +121,10 @@ static const true_false_string supported_string = {
* Our sub-packet dismantle structure for CLV's
*/
typedef struct {
int optcode; /* code for option */
char *tree_text; /* text for fold out */
gint *tree_id; /* id for add_item */
void (*dissect)(tvbuff_t *tvb, proto_tree *tree,
int optcode; /* code for option */
const char *tree_text; /* text for fold out */
gint *tree_id; /* id for add_item */
void (*dissect)(tvbuff_t *tvb, proto_tree *tree,
int offset, int length);
} nlsp_clv_handle_t;
@ -148,7 +148,7 @@ typedef struct {
*/
static void
nlsp_dissect_unknown(tvbuff_t *tvb, proto_tree *tree, int offset,
char *fmat, ...)
const char *fmat, ...)
{
va_list ap;

2
epan/dissectors/packet-nntp.c
View File

@ -45,7 +45,7 @@ static gint ett_nntp = -1;
static void
dissect_nntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
gchar *type;
const gchar *type;
proto_tree *nntp_tree;
proto_item *ti;
gint offset = 0;

2
epan/dissectors/packet-nt-sonmp.c
View File

@ -211,7 +211,7 @@ static gint ett_sonmp = -1;
static void
dissect_sonmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
char *hello_type;
const char *hello_type;
proto_tree *sonmp_tree = NULL;
proto_item *ti;

6
epan/dissectors/packet-ntp.c
View File

@ -155,8 +155,8 @@ static const value_string mode_types[] = {
* their Reference Clock ID (4bytes field) according to following table:
*/
static const struct {
char *id;
char *data;
const char *id;
const char *data;
} primary_sources[] = {
{ "LOCL", "uncalibrated local clock" },
{ "PPS\0", "atomic clock or other pulse-per-second source" },
@ -417,7 +417,7 @@ dissect_ntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree *ntp_tree;
proto_item *ti;
guint8 flags;
char *infostr;
const char *infostr;
void (*dissector)(tvbuff_t *, proto_item *, guint8);
if (check_col(pinfo->cinfo, COL_PROTOCOL))

2
epan/dissectors/packet-osi-options.c
View File

@ -277,7 +277,7 @@ static void
dissect_option_rfd( const guchar error, const guchar field, int offset,
guchar len, tvbuff_t *tvb, proto_tree *tree ) {
guchar error_class = 0;
char *format_string[] =
const char *format_string[] =
{ "Reason for discard {General} : %s, in field %u",
"Reason for discard {Address} : %s, in field %u",
"Reason for discard {Source Routing}: %s, in field %u",

8
epan/dissectors/packet-ospf.c
View File

@ -1457,9 +1457,9 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree,
guint8 link_type;
guint16 link_counter;
guint8 tos_counter;
char *link_type_str;
char *link_type_short_str;
char *link_id;
const char *link_type_str;
const char *link_type_short_str;
const char *link_id;
/* AS-external LSA */
guint8 options;
@ -1749,7 +1749,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, int offset, proto_tree *tree,
/* router LSA */
guint8 link_type;
char *link_type_str;
const char *link_type_str;
guint32 metric;
guint8 router_lsa_flags;

10
epan/dissectors/packet-pgm.c
View File

@ -484,11 +484,12 @@ static dissector_handle_t data_handle;
* was the URL for the PGM draft.
*/
static char *
static const char *
optsstr(nchar_t opts)
{
static char msg[256];
char *p = msg, *str;
char *p = msg;
const char *str;
if (opts == 0)
return("");
@ -526,11 +527,12 @@ optsstr(nchar_t opts)
}
return(msg);
}
static char *
static const char *
paritystr(nchar_t parity)
{
static char msg[256];
char *p = msg, *str;
char *p = msg;
const char *str;
if (parity == 0)
return("");

8
epan/dissectors/packet-pn-rt.c
View File

@ -101,10 +101,10 @@ dissect_pn_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint8 u8DataStatus;
guint8 u8TransferStatus;
guint16 u16CycleCounter;
gchar *pszProtAddInfo;
gchar *pszProtShort;
gchar *pszProtSummary;
gchar *pszProtComment;
const gchar *pszProtAddInfo;
const gchar *pszProtShort;
const gchar *pszProtSummary;
const gchar *pszProtComment;
proto_item *item = NULL;
proto_tree *ds_tree = NULL;
proto_tree *pn_rt_tree, *ti;

4
epan/dissectors/packet-portmap.c
View File

@ -79,7 +79,7 @@ dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
guint32 proto, version;
guint32 prog;
const char *prog_name;
char *proto_name;
const char *proto_name;
/* make sure we remember protocol type until the reply packet */
if(!pinfo->fd->flags.visited){
@ -117,7 +117,7 @@ dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
/* protocol */
proto = tvb_get_ntohl(tvb, offset+8);
proto_name = (char *)ipprotostr(proto);
proto_name = ipprotostr(proto);
proto_tree_add_uint_format(tree, hf_portmap_proto, tvb,
offset+8, 4, proto, "Proto: %s (%u)", proto_name, proto);
if (check_col(pinfo->cinfo, COL_INFO)) {

4
epan/dissectors/packet-q931.c
View File

@ -1748,7 +1748,7 @@ dissect_q931_information_rate_ie(tvbuff_t *tvb, int offset, int len,
static int
dissect_q931_guint16_value(tvbuff_t *tvb, int offset, int len,
proto_tree *tree, char *label)
proto_tree *tree, const char *label)
{
guint8 octet;
guint16 value;
@ -2312,7 +2312,7 @@ dissect_q931_user_user_ie(tvbuff_t *tvb, int offset, int len,
*/
static void
dissect_q931_ia5_ie(tvbuff_t *tvb, int offset, int len, proto_tree *tree,
char *label)
const char *label)
{
if (len != 0) {
proto_tree_add_text(tree, tvb, offset, len, "%s: %s", label,

4
epan/dissectors/packet-q933.c
View File

@ -1433,7 +1433,7 @@ dissect_q933_ns_facilities_ie(tvbuff_t *tvb, int offset, int len,
static int
dissect_q933_guint16_value(tvbuff_t *tvb, int offset, int len,
proto_tree *tree, char *label)
proto_tree *tree, const char *label)
{
guint8 octet;
guint16 value;
@ -1869,7 +1869,7 @@ dissect_q933_user_user_ie(tvbuff_t *tvb, int offset, int len,
*/
static void
dissect_q933_ia5_ie(tvbuff_t *tvb, int offset, int len, proto_tree *tree,
char *label)
const char *label)
{
if (len != 0) {
proto_tree_add_text(tree, tvb, offset, len, "%s: %s", label,

2
epan/dissectors/packet-quakeworld.c
View File

@ -152,7 +152,7 @@ skipwhite:
#define MAX_ARGS 80
static int cmd_argc = 0;
static char *cmd_argv[MAX_ARGS];
static char *cmd_null_string = "";
static const char *cmd_null_string = "";
static int cmd_argv_start[MAX_ARGS];
static int cmd_argv_length[MAX_ARGS];

4
epan/dissectors/packet-radius.h
View File

@ -35,7 +35,7 @@ typedef void (radius_attr_dissector_t)(radius_attr_info_t*, proto_tree*, packet_
typedef const gchar* (radius_avp_dissector_t)(proto_tree*,tvbuff_t*);
struct _radius_attr_info_t {
gchar *name;
const gchar *name;
guint code;
gboolean encrypt;
gboolean tagged;
@ -68,4 +68,4 @@ radius_attr_dissector_t radius_ifid;
extern void radius_register_avp_dissector(guint32 vendor_id, guint32 attribute_id, radius_avp_dissector_t dissector);
/* from radius_dict.l */
radius_dictionary_t* radius_load_dictionary (gchar* directory, gchar* filename, gchar** err_str);
radius_dictionary_t* radius_load_dictionary (gchar* directory, const gchar* filename, gchar** err_str);

4
epan/dissectors/packet-ranap.c
View File

@ -1241,7 +1241,7 @@ proto_tree_add_PERint32(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint offse
/* */
/*****************************************************************************/
static int
dissect_iE_Extension(tvbuff_t *tvb, proto_tree *tree, gint *offset, gint *bitoffset, char *description)
dissect_iE_Extension(tvbuff_t *tvb, proto_tree *tree, gint *offset, gint *bitoffset, const char *description)
{
proto_item *ext_item = NULL;
proto_tree *ext_tree = NULL;
@ -1967,7 +1967,7 @@ dissect_transportLayerInformation(tvbuff_t *tvb, proto_tree *ie_tree, gint *offs
static int
dissect_dataVolumeList (tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *bitoffset, char *parname)
dissect_dataVolumeList (tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *bitoffset, const char *parname)
{
proto_item *optionals_item = NULL;
proto_tree *optionals_tree = NULL;

2
epan/dissectors/packet-rdt.c
View File

@ -242,7 +242,7 @@ static const value_string packet_type_vals[] =
void rdt_add_address(packet_info *pinfo,
address *addr, int port,
int other_port,
gchar *setup_method, guint32 setup_frame_number)
const gchar *setup_method, guint32 setup_frame_number)
{
address null_addr;
conversation_t* p_conv;

2
epan/dissectors/packet-rdt.h
View File

@ -38,5 +38,5 @@ struct _rdt_conversation_info
void rdt_add_address(packet_info *pinfo,
address *addr, int port,
int other_port,
gchar *setup_method, guint32 setup_frame_number);
const gchar *setup_method, guint32 setup_frame_number);

8
epan/dissectors/packet-rsvp.c
View File

@ -1208,7 +1208,7 @@ static char *summary_session (tvbuff_t *tvb, int offset)
static char *summary_template (tvbuff_t *tvb, int offset)
{
static char buf[80];
char *objtype;
const char *objtype;
if (tvb_get_guint8(tvb, offset+2) == RSVP_CLASS_FILTER_SPEC)
objtype = "FILTERSPEC";
@ -1368,7 +1368,7 @@ dissect_rsvp_ifid_tlv (proto_tree *ti, proto_tree *rsvp_object_tree,
int tlv_off;
guint16 tlv_type;
guint tlv_len;
char *ifindex_name;
const char *ifindex_name;
proto_tree *rsvp_ifid_subtree, *ti2;
int offset2 = offset + 4;
@ -2855,7 +2855,7 @@ dissect_rsvp_label (proto_tree *ti, tvbuff_t *tvb,
int offset2 = offset + 4;
proto_tree *rsvp_object_tree;
int mylen, i;
char *name;
const char *name;
name = (class==RSVP_CLASS_SUGGESTED_LABEL ? "SUGGESTED LABEL":
(class==RSVP_CLASS_UPSTREAM_LABEL ? "UPSTREAM LABEL":
@ -3909,7 +3909,7 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb,
mylen = obj_length - 4;
switch(type) {
case 1: {
char *c;
const char *c;
proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1,
"C-type: 1");
for (i=1, l = 0; l < mylen; i++) {

2
epan/dissectors/packet-sap.c
View File

@ -222,7 +222,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += auth_data_len;
}
if (is_enc || is_comp) {
char *mangle;
const char *mangle;
if (is_enc && is_comp) mangle = "compressed and encrypted";
else if (is_enc) mangle = "encrypted";
else mangle = "compressed";

2
epan/dissectors/packet-scsi.c
View File

@ -4166,7 +4166,7 @@ dissect_sbc2_readcapacity10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
{
guint8 flags;
guint32 len, block_len, tot_len;
char *un;
const char *un;
if (!tree)
return;

6
epan/dissectors/packet-sip.c
View File

@ -125,8 +125,8 @@ static const char *sip_methods[] = {
* Updated with: http://www.ietf.org/internet-drafts/draft-ietf-sip-resource-priority-05.txt
*/
typedef struct {
char *name;
char *compact_name;
const char *name;
const char *compact_name;
} sip_header_t;
static const sip_header_t sip_headers[] = {
{ "Unknown-header", NULL }, /* 0 Pad so that the real headers start at index 1 */
@ -992,7 +992,7 @@ dissect_sip_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
tvbuff_t *next_tvb;
gboolean is_known_request;
gboolean found_match = FALSE;
char *descr;
const char *descr;
guint token_1_len = 0;
guint current_method_idx = 0;
proto_item *ts = NULL, *ti = NULL, *th = NULL, *sip_element_item = NULL;

4
epan/dissectors/packet-slsk.c
View File

@ -217,7 +217,7 @@ static const value_string slsk_attr_type[] = {
{ 2, "VBR"},
};
static char* connection_type(char con_type[]) {
static const char* connection_type(char con_type[]) {
if (strlen(con_type) != 1) return "Unknown";
if (con_type[0] == 'D') return "Distributed Search";
if (con_type[0] == 'P') return "Peer Connection"; /* "File Search Result / User Info Request / Get Shared File List" */
@ -225,7 +225,7 @@ static char* connection_type(char con_type[]) {
return "Unknown";
}
static gboolean check_slsk_format(tvbuff_t *tvb, int offset, char format[]){
static gboolean check_slsk_format(tvbuff_t *tvb, int offset, const char format[]){
/*
* Returns TRUE if tvbuff beginning at offset matches a certain format

2
epan/dissectors/packet-smb.c
View File

@ -1319,7 +1319,7 @@ static const true_false_string tfs_da_writetru = {
"Write through disabled"
};
static int
dissect_access(tvbuff_t *tvb, proto_tree *parent_tree, int offset, char *type)
dissect_access(tvbuff_t *tvb, proto_tree *parent_tree, int offset, const char *type)
{
guint16 mask;
proto_item *item = NULL;

6
epan/dissectors/packet-snmp.c
View File

@ -485,7 +485,7 @@ struct _SNMP_CNV
guint class;
guint tag;
gint syntax;
gchar *name;
const gchar *name;
};
static SNMP_CNV SnmpCnv [] =
@ -523,7 +523,7 @@ static SNMP_CNV SnmpCnv [] =
* RETURNS: name on success, NULL on failure
*/
static gchar *
static const gchar *
snmp_tag_cls2syntax ( guint tag, guint cls, gushort *syntax)
{
SNMP_CNV *cnv;
@ -944,7 +944,7 @@ snmp_variable_decode(proto_tree *snmp_tree,
gboolean def;
guint vb_length;
gushort vb_type;
gchar *vb_type_name;
const gchar *vb_type_name;
int ret;
guint cls, con, tag;

8
epan/dissectors/packet-socks.c
View File

@ -181,7 +181,7 @@ typedef struct {
static char *address_type_table[] = {
static const char *address_type_table[] = {
"Unknown",
"IPv4",
"Unknown",
@ -236,7 +236,7 @@ static GMemChunk *socks_vals = NULL;
static int display_string(tvbuff_t *tvb, int offset,
proto_tree *tree, char *label){
proto_tree *tree, const char *label){
/* display a string with a length, characters encoding */
/* they are displayed under a tree with the name in Label variable */
@ -269,7 +269,7 @@ static int display_string(tvbuff_t *tvb, int offset,
static char *get_auth_method_name( guint Number){
static const char *get_auth_method_name( guint Number){
/* return the name of the authenication method */
@ -287,7 +287,7 @@ static char *get_auth_method_name( guint Number){
}
static char *get_command_name( guint Number){
static const char *get_command_name( guint Number){
/* return the name of the command as a string */

2
epan/dissectors/packet-ssl.c
View File

@ -213,7 +213,7 @@ static gint ett_pct_exch_suites = -1;
#define SSL_VER_PCT 4
/* corresponds to the #defines above */
static gchar* ssl_version_short_names[] = {
static const gchar* ssl_version_short_names[] = {
"SSL",
"SSLv2",
"SSLv3",

2
epan/dissectors/packet-t38.c
View File

@ -177,7 +177,7 @@ static gboolean global_t38_show_setup_info = TRUE;
void t38_add_address(packet_info *pinfo,
address *addr, int port,
int other_port,
gchar *setup_method, guint32 setup_frame_number)
const gchar *setup_method, guint32 setup_frame_number)
{
address null_addr;
conversation_t* p_conv;

2
epan/dissectors/packet-t38.h
View File

@ -37,4 +37,4 @@ struct _t38_conversation_info
void t38_add_address(packet_info *pinfo,
address *addr, int port,
int other_port,
gchar *setup_method, guint32 setup_frame_number);
const gchar *setup_method, guint32 setup_frame_number);

2
epan/radius_dict.l
View File

@ -295,7 +295,7 @@ static void destroy_dict(radius_dictionary_t* d) {
g_free(d);
}
radius_dictionary_t* radius_load_dictionary (gchar* dir, gchar* filename, gchar** err_str) {
radius_dictionary_t* radius_load_dictionary (gchar* dir, const gchar* filename, gchar** err_str) {
int i;
directory = dir;

2
epan/tap.c
View File

@ -404,7 +404,7 @@ find_tap_id(const char *name)
* message.
*/
GString *
register_tap_listener(const char *tapname, void *tapdata, char *fstring, tap_reset_cb reset, tap_packet_cb packet, tap_draw_cb draw)
register_tap_listener(const char *tapname, void *tapdata, const char *fstring, tap_reset_cb reset, tap_packet_cb packet, tap_draw_cb draw)
{
tap_listener_t *tl;
int tap_id;

2
epan/tap.h
View File

@ -50,7 +50,7 @@ extern void tap_push_tapped_queue(epan_dissect_t *edt);
extern void reset_tap_listeners(void);
extern void draw_tap_listeners(gboolean draw_all);
extern GString *register_tap_listener(const char *tapname, void *tapdata,
char *fstring, tap_reset_cb tap_reset, tap_packet_cb tap_packet,
const char *fstring, tap_reset_cb tap_reset, tap_packet_cb tap_packet,
tap_draw_cb tap_draw);
extern void remove_tap_listener(void *tapdata);
extern gboolean have_tap_listeners(void);