osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add missing const attribute to some char * 

Fix some "assignment discards qualifiers from pointer target type", etc

svn path=/trunk/; revision=41993
This commit is contained in:
Jakub Zawadzki 2012-04-09 17:53:04 +00:00
parent 76604977ef
commit 9c48f9ca96
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,8 +364,8 @@ dissect_object_id(tvbuff_t *tvb, proto_tree *tree, int offset, guint8 flags, enu
g_snprintf(&str_oid[0], 2048, "(null)");
if(tree) {
char *range = "";
char *inclusion = (include) ? " (Inclusive)" : " (Exclusive)";
const char *range = "";
const char *inclusion = (include) ? " (Inclusive)" : " (Exclusive)";
switch (oid_usage) {
case OID_START_RANGE: range = "(Range Start) "; break;
case OID_END_RANGE: range = " (Range End) "; break;

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

@ -520,7 +520,7 @@ dissect_coap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
proto_item *payload_item = NULL;
tvbuff_t *payload_tvb;
guint payload_length = coap_length - offset;
char *ctype_str_default = "";
const char *ctype_str_default = "";
/*
* TODO: should the content type be canonicalized ?

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

@ -1261,8 +1261,8 @@ dissect_bfield(gboolean dect_packet_type _U_, guint8 ba,
guint8 xcrc/*, xcrclen*/;
guint16 blen;
gint start_offset;
char *bfield_str;
char *bfield_short_str;
const char *bfield_str;
const char *bfield_short_str;
proto_item *bfieldti = NULL;
proto_tree *BField = NULL;

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

@ -137,7 +137,7 @@ dissect_gopher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
proto_tree *gopher_tree, *dir_tree = NULL;
gboolean client = is_client(pinfo);
gint line_len;
gchar *request = "[Invalid request]";
const gchar *request = "[Invalid request]";
gboolean is_dir = FALSE;
gint offset = 0, next_offset;
gint sel_start, host_start, port_start;

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

@ -3416,7 +3416,7 @@ extern gint dissect_reload_messagecontents(tvbuff_t *tvb, packet_info *pinfo, pr
if (message_code != RELOAD_ERROR) {
proto_item *ti_message_body;
proto_tree *message_body_tree;
gchar *message_type_str = NULL;
const gchar *message_type_str = NULL;
/* message_code was already parsed */
{

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

@ -1204,7 +1204,7 @@ dissect_sbc_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_,
guint8 service_action;
guint32 block_len;
guint64 len, tot_len;
char *un;
const char *un;
static const int *pmi_fields[] = {
&hf_scsi_sbc_pmi,
NULL

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

@ -1178,8 +1178,8 @@ dissect_siii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item* ti;
proto_tree* siii_tree;
guint type;
char* tel_ch="?";
char* tel_type="?";
const char* tel_ch="?";
const char* tel_type="?";
guint tel_no = 0;
/* setup columns */

4
epan/dissectors/packet-smb-browse.c
View File

@ -587,7 +587,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
gint namelen;
guint8 server_count, reset_cmd;
guint8 os_major_ver, os_minor_ver;
gchar *windows_version = NULL;
const gchar *windows_version = NULL;
int i;
guint32 uptime;
@ -846,7 +846,7 @@ dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
guint32 periodicity;
const guint8 *host_name;
guint8 os_major_ver, os_minor_ver;
gchar *windows_version = NULL;
const gchar *windows_version = NULL;
guint namelen;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "BROWSER");

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

@ -1568,7 +1568,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset,
guint32 value = -1;
void* valuep = NULL;
header_field_info* hf_info = NULL;
char* fmt = NULL;
const char* fmt = NULL;
proto_item_set_text(tlv_item, "%s",
val_to_str(tlv_type, eapwps_tlv_types, "Unknown (0x%04x)"));

2
ui/gtk/prefs_capture.c
View File

@ -104,7 +104,7 @@ capture_prefs_show(void)
GList *if_list, *combo_list;
int err;
int row = 0;
gchar *tooltips_text;
const gchar *tooltips_text;
/* Main vertical box */
main_vb = gtk_vbox_new(FALSE, 7);

2
ui/gtk/voip_calls.c
View File

@ -3122,7 +3122,7 @@ unistim_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_,
unistim_info_t *tmp_unistim_info = NULL;
GList *list = NULL;
GString *g_tmp = NULL;
gchar *frame_label = NULL;
const gchar *frame_label = NULL;
gchar *comment = NULL;
/* Fetch specific packet infos */