diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-04-09 17:53:04 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-04-09 17:53:04 +0000 |
commit | 9c48f9ca96b1409aa373ee7a8c253b2ce9c196a3 (patch) | |
tree | d36b0de8b6074ddb9beaafb8e4b947cab495369e /epan/dissectors | |
parent | 76604977ef1bfd2ecdac127e3ada60f9cff6e0fc (diff) | |
download | wireshark-9c48f9ca96b1409aa373ee7a8c253b2ce9c196a3.tar.gz |
Add missing const attribute to some char *
Fix some "assignment discards qualifiers from pointer target type", etc
svn path=/trunk/; revision=41993
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-agentx.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-coap.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dect.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-gopher.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-reload.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-scsi-sbc.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-sercosiii.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-smb-browse.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-wps.c | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c index 011fe33d86..8615506842 100644 --- a/epan/dissectors/packet-agentx.c +++ b/epan/dissectors/packet-agentx.c @@ -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; diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c index 7cc1ddff73..3dd5d4f700 100644 --- a/epan/dissectors/packet-coap.c +++ b/epan/dissectors/packet-coap.c @@ -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 ? diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index cf85f53d64..c9fc66205f 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -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; diff --git a/epan/dissectors/packet-gopher.c b/epan/dissectors/packet-gopher.c index 24e2a0fc9a..fd75f2a1fe 100644 --- a/epan/dissectors/packet-gopher.c +++ b/epan/dissectors/packet-gopher.c @@ -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; diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index 3f05238a52..00372e4cd8 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -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 */ { diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c index b369dcdf99..efd26c93ac 100644 --- a/epan/dissectors/packet-scsi-sbc.c +++ b/epan/dissectors/packet-scsi-sbc.c @@ -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 diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c index 97fdf9b59d..b750d05177 100644 --- a/epan/dissectors/packet-sercosiii.c +++ b/epan/dissectors/packet-sercosiii.c @@ -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 */ diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index c875da5584..361e4f0946 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/epan/dissectors/packet-smb-browse.c @@ -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"); diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index 8e19992d8c..b8108e4e1d 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -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)")); |