diff options
-rw-r--r-- | epan/dissectors/packet-aim-icq.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-aim.h | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-clnp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-nt.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-nt.h | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-samr.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-spoolss.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc.h | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-dcom-remunkn.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dcom.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dcom.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dnp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee80211.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-ipv6.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-ppp.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-windows-common.h | 2 | ||||
-rw-r--r-- | epan/reassemble.c | 2 | ||||
-rw-r--r-- | epan/reassemble.h | 4 | ||||
-rw-r--r-- | ip_opts.h | 2 |
20 files changed, 44 insertions, 44 deletions
diff --git a/epan/dissectors/packet-aim-icq.c b/epan/dissectors/packet-aim-icq.c index e4cb11756c..f73b3ffe94 100644 --- a/epan/dissectors/packet-aim-icq.c +++ b/epan/dissectors/packet-aim-icq.c @@ -87,7 +87,7 @@ static gint hf_icq_dropped_msg_flag = -1; static struct { guint16 subtype; - char *name; + const char *name; int (*dissector) (tvbuff_t *, packet_info *, proto_tree *); } icq_calls [] = { { 0x0001, "Server Error Reply", NULL }, diff --git a/epan/dissectors/packet-aim.h b/epan/dissectors/packet-aim.h index 12f13c624c..bd50f806be 100644 --- a/epan/dissectors/packet-aim.h +++ b/epan/dissectors/packet-aim.h @@ -32,7 +32,7 @@ typedef struct _aim_tlv { guint16 valueid; - char *desc; + const char *desc; int (*dissector) (proto_item *ti, guint16 value_id, tvbuff_t *tvb, packet_info *); } aim_tlv; @@ -44,7 +44,7 @@ struct aiminfo { typedef struct _aim_subtype { guint16 id; - char *name; + const char *name; int (*dissector) (tvbuff_t *, packet_info *, proto_tree *); } aim_subtype; diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 681aca1952..f280247ac8 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -793,7 +793,7 @@ static int ositp_decode_DR(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, proto_item *ti; guint16 dst_ref, src_ref; guchar reason; - char *str; + const char *str; if (li < LI_MIN_DR) return -1; @@ -1574,7 +1574,7 @@ static int ositp_decode_ER(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, { proto_tree *cotp_tree; proto_item *ti; - char *str; + const char *str; guint16 dst_ref; if (li > LI_MAX_ER) diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index fb9fac0fa9..6c27cf249b 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -625,7 +625,7 @@ void dcerpc_smb_store_pol_pkts(e_ctx_hnd *policy_hnd, packet_info *pinfo, /* Store a text string with a policy handle */ void dcerpc_smb_store_pol_name(e_ctx_hnd *policy_hnd, packet_info *pinfo, - char *name) + const char *name) { pol_hash_value *value; pol_value *pol; @@ -1127,7 +1127,7 @@ void cb_str_postprocess(packet_info *pinfo, proto_tree *tree _U_, int dissect_ndr_str_pointer_item(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, - guint8 *drep, int type, char *text, + guint8 *drep, int type, const char *text, int hf_index, int levels) { return dissect_ndr_pointer_cb( diff --git a/epan/dissectors/packet-dcerpc-nt.h b/epan/dissectors/packet-dcerpc-nt.h index ab10093448..108beafceb 100644 --- a/epan/dissectors/packet-dcerpc-nt.h +++ b/epan/dissectors/packet-dcerpc-nt.h @@ -163,7 +163,7 @@ dcerpc_smb_store_pol_pkts(e_ctx_hnd *policy_hnd, packet_info *pinfo, void dcerpc_smb_store_pol_name(e_ctx_hnd *policy_hnd, packet_info *pinfo, - char *name); + const char *name); /* Fetch details stored with a policy handle */ @@ -216,7 +216,7 @@ int dissect_ndr_uint16s(tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_ndr_str_pointer_item(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, - guint8 *drep, int type, char *text, + guint8 *drep, int type, const char *text, int hf_index, int levels); /* diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c index 43634d7c0c..4fe262b113 100644 --- a/epan/dissectors/packet-dcerpc-samr.c +++ b/epan/dissectors/packet-dcerpc-samr.c @@ -2762,7 +2762,7 @@ samr_dissect_INDEX_ARRAY_value (tvbuff_t *tvb, int offset, return offset; } -static char * +static const char * plural_ending(const char *string) { size_t string_len; diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 9355d032dd..b63fc2523d 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -461,7 +461,7 @@ static int hf_time_msec = -1; static int dissect_SYSTEM_TIME(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, guint8 *drep, char *name, + proto_tree *tree, guint8 *drep, const char *name, gboolean add_subtree, char **data) { proto_item *item = NULL; @@ -708,7 +708,7 @@ static int SpoolssGetPrinterData_r(tvbuff_t *tvb, int offset, hf_printerdata_type, &type); if (check_col(pinfo->cinfo, COL_INFO)) { - char *data = dcv->private_data ? dcv->private_data : "????"; + const char *data = dcv->private_data ? dcv->private_data : "????"; col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", data); } @@ -805,7 +805,7 @@ static int SpoolssGetPrinterDataEx_r(tvbuff_t *tvb, int offset, tvb, offset, pinfo, tree, drep, hf_returned, &size); if (check_col(pinfo->cinfo, COL_INFO)) { - char *data = dcv->private_data ? dcv->private_data : "????"; + const char *data = dcv->private_data ? dcv->private_data : "????"; col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", data); } @@ -963,7 +963,7 @@ static int SpoolssSetPrinterDataEx_r(tvbuff_t *tvb, int offset, static int dissect_spoolss_uint16uni(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint8 *drep _U_, char **data, - char *name) + const char *name) { gint len, remaining; char *text; @@ -2713,7 +2713,7 @@ static const value_string printer_notify_types[] = { 0, NULL } }; -static char *notify_plural(int count) +static const char *notify_plural(int count) { if (count == 1) return "notification"; @@ -6220,7 +6220,7 @@ static int SpoolssEnumPrinterKey_q(tvbuff_t *tvb, int offset, hf_printerdata_key, TRUE, &key_name); if (check_col(pinfo->cinfo, COL_INFO)) { - char *kn = key_name; + const char *kn = key_name; if (!key_name[0]) kn = "\"\""; diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 065f03394b..fcbaa25b16 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -2080,7 +2080,7 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_ndr_toplevel_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, dcerpc_dissect_fnct_t *fnct, - int type, char *text, int hf_index) + int type, const char *text, int hf_index) { int ret; @@ -2093,7 +2093,7 @@ dissect_ndr_toplevel_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_ndr_embedded_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, dcerpc_dissect_fnct_t *fnct, - int type, char *text, int hf_index) + int type, const char *text, int hf_index) { int ret; diff --git a/epan/dissectors/packet-dcerpc.h b/epan/dissectors/packet-dcerpc.h index 775690c829..1cfbafaf62 100644 --- a/epan/dissectors/packet-dcerpc.h +++ b/epan/dissectors/packet-dcerpc.h @@ -194,11 +194,11 @@ int dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, guint8 *drep); int dissect_ndr_embedded_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, - dcerpc_dissect_fnct_t *fnct, int type, char *text, + dcerpc_dissect_fnct_t *fnct, int type, const char *text, int hf_index); int dissect_ndr_toplevel_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, - dcerpc_dissect_fnct_t *fnct, int type, char *text, + dcerpc_dissect_fnct_t *fnct, int type, const char *text, int hf_index); /* dissect a NDR unidimensional conformant array */ diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c index 51c34ae8cf..798e9ab243 100644 --- a/epan/dissectors/packet-dcom-remunkn.c +++ b/epan/dissectors/packet-dcom-remunkn.c @@ -188,7 +188,7 @@ dissect_remunk_remrelease_rqst(tvbuff_t *tvb, int offset, e_uuid_t ipid; guint32 u32PublicRefs; guint32 u32PrivateRefs; - gchar *pszFormat; + const gchar *pszFormat; proto_item *sub_item; proto_tree *sub_tree; guint32 u32SubStart; diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index 8c0ab83222..90e658950c 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -1151,7 +1151,7 @@ dissect_dcom_VARIANT(tvbuff_t *tvb, int offset, packet_info *pinfo, int dissect_dcom_append_UUID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, - int hfindex, gchar *field_name, int field_index) + int hfindex, const gchar *field_name, int field_index) { e_uuid_t uuid; const gchar *uuid_name; diff --git a/epan/dissectors/packet-dcom.h b/epan/dissectors/packet-dcom.h index 97d6fdb87d..ccf09e762f 100644 --- a/epan/dissectors/packet-dcom.h +++ b/epan/dissectors/packet-dcom.h @@ -59,7 +59,7 @@ dissect_dcom_that(tvbuff_t *tvb, int offset, extern int dissect_dcom_append_UUID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, - int hfindex, gchar *field_name, int field_index); + int hfindex, const gchar *field_name, int field_index); extern const gchar* dcom_uuid_to_str(e_uuid_t *uuid); extern int diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index d33d129f44..1e33594703 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -857,7 +857,7 @@ calculateCRC(const void *buf, guint len) { /* Adds text to item, with trailing "," if required */ /*****************************************************************/ static gboolean -add_item_text(proto_item *item, gchar *text, gboolean comma_needed) +add_item_text(proto_item *item, const gchar *text, gboolean comma_needed) { if (comma_needed) { proto_item_append_text(item, ", "); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 9bd4d07d7d..0aa1477eee 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -814,7 +814,7 @@ add_fixed_field (proto_tree * tree, tvbuff_t * tvb, int offset, int lfcode) } } -static char *wpa_cipher_str[] = +static const char *wpa_cipher_str[] = { "NONE", "WEP (40-bit)", @@ -824,7 +824,7 @@ static char *wpa_cipher_str[] = "WEP (104-bit)", }; -static char * +static const char * wpa_cipher_idx2str(guint idx) { if (idx < sizeof(wpa_cipher_str)/sizeof(wpa_cipher_str[0])) @@ -832,14 +832,14 @@ wpa_cipher_idx2str(guint idx) return "UNKNOWN"; } -static char *wpa_keymgmt_str[] = +static const char *wpa_keymgmt_str[] = { "NONE", "WPA", "PSK", }; -static char * +static const char * wpa_keymgmt_idx2str(guint idx) { if (idx < sizeof(wpa_keymgmt_str)/sizeof(wpa_keymgmt_str[0])) @@ -1771,7 +1771,7 @@ dissect_ieee80211_mgt (guint16 fcf, tvbuff_t * tvb, packet_info * pinfo, } static void -set_src_addr_cols(packet_info *pinfo, const guint8 *addr, char *type) +set_src_addr_cols(packet_info *pinfo, const guint8 *addr, const char *type) { if (check_col(pinfo->cinfo, COL_RES_DL_SRC)) col_add_fstr(pinfo->cinfo, COL_RES_DL_SRC, "%s (%s)", @@ -1782,7 +1782,7 @@ set_src_addr_cols(packet_info *pinfo, const guint8 *addr, char *type) } static void -set_dst_addr_cols(packet_info *pinfo, const guint8 *addr, char *type) +set_dst_addr_cols(packet_info *pinfo, const guint8 *addr, const char *type) { if (check_col(pinfo->cinfo, COL_RES_DL_DST)) col_add_fstr(pinfo->cinfo, COL_RES_DL_DST, "%s (%s)", diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index f092eeca94..5e0a0135e6 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -363,7 +363,7 @@ dissect_ipv6_options(tvbuff_t *tvb, int offset, guint length, const ip_tcp_opt *optp; opt_len_type len_type; unsigned int optlen; - char *name; + const char *name; char name_str[7+1+1+2+2+1+1]; /* "Unknown (0x%02x)" */ void (*dissect)(const struct ip_tcp_opt *, tvbuff_t *, int, guint, packet_info *, proto_tree *); @@ -450,7 +450,7 @@ dissect_ipv6_options(tvbuff_t *tvb, int offset, guint length, } static int -dissect_opts(tvbuff_t *tvb, int offset, proto_tree *tree, char *optname) +dissect_opts(tvbuff_t *tvb, int offset, proto_tree *tree, const char *optname) { struct ip6_ext ext; int len; @@ -792,7 +792,7 @@ again: put something in the Info column; leave it there. */ if (!ah) { if (hopopts || routing || dstopts) { - char *sep = "IPv6 "; + const char *sep = "IPv6 "; if (hopopts) { col_append_fstr(pinfo->cinfo, COL_INFO, "%shop-by-hop options", sep); diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index e878bc2d63..20a26144cc 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -1636,7 +1636,7 @@ dissect_lcp_async_map_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, proto_tree *tree) { guint32 map; - char *mapstr; + const char *mapstr; static const char *ctrlchars[32] = { "NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL", "BS", "HT", "NL", "VT", "NP (FF)", "CR", "SO", "SI", @@ -3079,11 +3079,11 @@ static const true_false_string frag_truth = { static void dissect_mp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - proto_tree *mp_tree, *hdr_tree; - proto_item *ti = NULL; - guint8 flags; - gchar *flag_str; - tvbuff_t *next_tvb; + proto_tree *mp_tree, *hdr_tree; + proto_item *ti = NULL; + guint8 flags; + const gchar *flag_str; + tvbuff_t *next_tvb; if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP MP"); diff --git a/epan/dissectors/packet-windows-common.h b/epan/dissectors/packet-windows-common.h index 6d7f2b795a..8591614c25 100644 --- a/epan/dissectors/packet-windows-common.h +++ b/epan/dissectors/packet-windows-common.h @@ -159,7 +159,7 @@ struct standard_mapping { }; struct access_mask_info { - char *specific_rights_name; + const char *specific_rights_name; nt_access_mask_fn_t *specific_rights_fn; struct generic_mapping *generic_mapping; struct standard_mapping *standard_mapping; diff --git a/epan/reassemble.c b/epan/reassemble.c index 60e7312a0d..659554507c 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -1635,7 +1635,7 @@ fragment_add_seq_next(tvbuff_t *tvb, int offset, packet_info *pinfo, */ tvbuff_t * process_reassembled_data(tvbuff_t *tvb, int offset, packet_info *pinfo, - char *name, fragment_data *fd_head, const fragment_items *fit, + const char *name, fragment_data *fd_head, const fragment_items *fit, gboolean *update_col_infop, proto_tree *tree) { tvbuff_t *next_tvb; diff --git a/epan/reassemble.h b/epan/reassemble.h index 2478a9a6f8..21768a739c 100644 --- a/epan/reassemble.h +++ b/epan/reassemble.h @@ -227,12 +227,12 @@ typedef struct _fragment_items { int *hf_fragment_error; int *hf_reassembled_in; - char *tag; + const char *tag; } fragment_items; extern tvbuff_t * process_reassembled_data(tvbuff_t *tvb, int offset, packet_info *pinfo, - char *name, fragment_data *fd_head, const fragment_items *fit, + const char *name, fragment_data *fd_head, const fragment_items *fit, gboolean *update_col_infop, proto_tree *tree); extern gboolean @@ -35,7 +35,7 @@ typedef enum { /* Member of table of IP or TCP options. */ typedef struct ip_tcp_opt { int optcode; /* code for option */ - char *name; /* name of option */ + const char *name; /* name of option */ int *subtree_index; /* pointer to subtree index for option */ opt_len_type len_type; /* type of option length field */ int optlen; /* value length should be (minimum if VARIABLE) */ |