diff options
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-bluetooth.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-spoolss.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-diameter.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-mq.h | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ncp2222.inc | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-reload.c | 36 | ||||
-rw-r--r-- | epan/dissectors/packet-xml.c | 4 |
7 files changed, 28 insertions, 28 deletions
diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index 36dbff9ce0..3014ac9a09 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -1958,8 +1958,8 @@ proto_reg_handoff_bluetooth(void) dissector_add_for_decode_as("usb.device", bluetooth_usb_handle); - wmem_tree_insert_string(bluetooth_uuids, "00000001-0000-1000-8000-0002EE000002", (gchar *) "SyncML Server", 0); - wmem_tree_insert_string(bluetooth_uuids, "00000002-0000-1000-8000-0002EE000002", (gchar *) "SyncML Client", 0); + wmem_tree_insert_string(bluetooth_uuids, "00000001-0000-1000-8000-0002EE000002", "SyncML Server", 0); + wmem_tree_insert_string(bluetooth_uuids, "00000002-0000-1000-8000-0002EE000002", "SyncML Client", 0); /* TODO: Add UUID128 verion of UUID16; UUID32? UUID16? */ } diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 235791a615..8479845d6d 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -6224,7 +6224,7 @@ SpoolssEnumPrinterKey_q(tvbuff_t *tvb, int offset, hf_printerdata_key, TRUE, &key_name); if (!key_name[0]) - key_name = (char*)"\"\""; + key_name = "\"\""; col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", key_name); diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 3cdb016e51..5ed573b44c 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -387,7 +387,7 @@ diameterstat_init(struct register_srt* srt _U_, GArray* srt_array, srt_gui_init_ idx = (int *)g_malloc(sizeof(int)); *idx = 0; diameterstat_cmd_str_hash = g_hash_table_new(g_str_hash,g_str_equal); - g_hash_table_insert(diameterstat_cmd_str_hash, (gchar *)"Unknown", idx); + g_hash_table_insert(diameterstat_cmd_str_hash, "Unknown", idx); /** @todo the filter to use in stead of NULL is "diameter.cmd.code" * to enable the filter popup in the service response time dalouge @@ -1882,7 +1882,7 @@ dictionary_load(void) all_cmds = g_array_new(TRUE,TRUE,sizeof(value_string)); wmem_tree_insert32(dictionary.vnds,0,&no_vnd); - g_hash_table_insert(vendors,(gchar *)"None",&no_vnd); + g_hash_table_insert(vendors,"None",&no_vnd); /* initialize the types hash with the known basic types */ for (type = basic_types; type->name; type++) { diff --git a/epan/dissectors/packet-mq.h b/epan/dissectors/packet-mq.h index 2334b2810a..c693d31b9a 100644 --- a/epan/dissectors/packet-mq.h +++ b/epan/dissectors/packet-mq.h @@ -2495,14 +2495,14 @@ typedef struct _mq_parm_t /****************************************************************/ /* Inquire on all properties - "%" */ -#define MQ_MQPROP_INQUIRE_ALL (MQPTR)(char*)"%",\ +#define MQ_MQPROP_INQUIRE_ALL (MQPTR)"%",\ 0,\ 0,\ 1,\ MQCCSI_APPL /* Inquire on all 'usr' properties - "usr.%" */ -#define MQ_MQPROP_INQUIRE_ALL_USR (MQPTR)(char*)"usr.%",\ +#define MQ_MQPROP_INQUIRE_ALL_USR (MQPTR)"usr.%",\ 0,\ 0,\ 5,\ diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc index b99d48ecd8..e8f950e348 100644 --- a/epan/dissectors/packet-ncp2222.inc +++ b/epan/dissectors/packet-ncp2222.inc @@ -2898,7 +2898,7 @@ static void file_rights_expert_func(ptvcursor_t *ptvc, packet_info *pinfo, const if (request) { guint8 oaction = 0, path_count = 0; guint16 rights = 0; - gchar* filename = (gchar*)""; + gchar* filename = ""; if (ncp_rec->func == 87) { switch(ncp_rec->subfunc) diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index 54e04148d5..aaeb387479 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -693,24 +693,24 @@ typedef struct _Kind { } kind_t; static kind_t predefined_kinds[] = { - {(gchar *)"INVALID" ,DATAKINDID_INVALID, -1}, - {(gchar *)"SIP-REGISTRATION" ,DATAKINDID_SIP_REGISTRATION, DATAMODEL_DICTIONARY}, - {(gchar *)"TURN-SERVICE" ,DATAKINDID_TURNSERVICE, DATAMODEL_SINGLE}, - {(gchar *)"CERTIFICATE_BY_NODE" ,DATAKINDID_CERTIFICATE_BY_NODE, DATAMODEL_ARRAY}, - {(gchar *)"RESERVED_ROUTING_TABLE_SIZE" ,DATAKINDID_RESERVED_ROUTING_TABLE_SIZE, -1}, - {(gchar *)"RESERVED_SOFTWARE_VERSION" ,DATAKINDID_RESERVED_SOFTWARE_VERSION, -1}, - {(gchar *)"RESERVED_MACHINE_UPTIME" ,DATAKINDID_RESERVED_MACHINE_UPTIME, -1}, - {(gchar *)"DATAKINDID_RESERVED_APP_UPTIME" ,DATAKINDID_RESERVED_APP_UPTIME, -1}, - {(gchar *)"RESERVED_MEMORY_FOOTPRINT" ,DATAKINDID_RESERVED_MEMORY_FOOTPRINT, -1}, - {(gchar *)"RESERVED_DATASIZE_STORED" ,DATAKINDID_RESERVED_DATASIZE_STORED, -1}, - {(gchar *)"RESERVED_INSTANCES_STORED" ,DATAKINDID_RESERVED_INSTANCES_STORED, -1}, - {(gchar *)"RESERVED_MESSAGES_SENT_RCVD" ,DATAKINDID_RESERVED_MESSAGES_SENT_RCVD, -1}, - {(gchar *)"RESERVED_EWMA_BYTES_SENT" ,DATAKINDID_RESERVED_EWMA_BYTES_SENT, -1}, - {(gchar *)"RESERVED_EWMA_BYTES_RCVD" ,DATAKINDID_RESERVED_EWMA_BYTES_RCVD, -1}, - {(gchar *)"RESERVED_LAST_CONTACT" ,DATAKINDID_RESERVED_LAST_CONTACT, -1}, - {(gchar *)"RESERVED_RTT" ,DATAKINDID_RESERVED_RTT, -1}, - {(gchar *)"CERTIFICATE_BY_USER" ,DATAKINDID_CERTIFICATE_BY_USER, DATAMODEL_ARRAY}, - {(gchar *)"REDIR" ,DATAKINDID_REDIR, DATAMODEL_DICTIONARY}, + {"INVALID" ,DATAKINDID_INVALID, -1}, + {"SIP-REGISTRATION" ,DATAKINDID_SIP_REGISTRATION, DATAMODEL_DICTIONARY}, + {"TURN-SERVICE" ,DATAKINDID_TURNSERVICE, DATAMODEL_SINGLE}, + {"CERTIFICATE_BY_NODE" ,DATAKINDID_CERTIFICATE_BY_NODE, DATAMODEL_ARRAY}, + {"RESERVED_ROUTING_TABLE_SIZE" ,DATAKINDID_RESERVED_ROUTING_TABLE_SIZE, -1}, + {"RESERVED_SOFTWARE_VERSION" ,DATAKINDID_RESERVED_SOFTWARE_VERSION, -1}, + {"RESERVED_MACHINE_UPTIME" ,DATAKINDID_RESERVED_MACHINE_UPTIME, -1}, + {"DATAKINDID_RESERVED_APP_UPTIME" ,DATAKINDID_RESERVED_APP_UPTIME, -1}, + {"RESERVED_MEMORY_FOOTPRINT" ,DATAKINDID_RESERVED_MEMORY_FOOTPRINT, -1}, + {"RESERVED_DATASIZE_STORED" ,DATAKINDID_RESERVED_DATASIZE_STORED, -1}, + {"RESERVED_INSTANCES_STORED" ,DATAKINDID_RESERVED_INSTANCES_STORED, -1}, + {"RESERVED_MESSAGES_SENT_RCVD" ,DATAKINDID_RESERVED_MESSAGES_SENT_RCVD, -1}, + {"RESERVED_EWMA_BYTES_SENT" ,DATAKINDID_RESERVED_EWMA_BYTES_SENT, -1}, + {"RESERVED_EWMA_BYTES_RCVD" ,DATAKINDID_RESERVED_EWMA_BYTES_RCVD, -1}, + {"RESERVED_LAST_CONTACT" ,DATAKINDID_RESERVED_LAST_CONTACT, -1}, + {"RESERVED_RTT" ,DATAKINDID_RESERVED_RTT, -1}, + {"CERTIFICATE_BY_USER" ,DATAKINDID_CERTIFICATE_BY_USER, DATAMODEL_ARRAY}, + {"REDIR" ,DATAKINDID_REDIR, DATAMODEL_DICTIONARY}, }; diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c index 1f13abc1e2..398b6f2d1f 100644 --- a/epan/dissectors/packet-xml.c +++ b/epan/dissectors/packet-xml.c @@ -75,8 +75,8 @@ static tvbparse_wanted_t *want_heur; static GHashTable *xmpli_names; static GHashTable *media_types; -static xml_ns_t xml_ns = {(gchar *)"xml", "/", -1, -1, -1, NULL, NULL, NULL}; -static xml_ns_t unknown_ns = {(gchar *)"unknown", "?", -1, -1, -1, NULL, NULL, NULL}; +static xml_ns_t xml_ns = {"xml", "/", -1, -1, -1, NULL, NULL, NULL}; +static xml_ns_t unknown_ns = {"unknown", "?", -1, -1, -1, NULL, NULL, NULL}; static xml_ns_t *root_ns; static gboolean pref_heuristic_unicode = FALSE; |