aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt1
-rw-r--r--capinfos.c6
-rw-r--r--capture_opts.h28
-rw-r--r--captype.c6
-rw-r--r--configure.ac1
-rw-r--r--dumpcap.c6
-rw-r--r--editcap.c6
-rw-r--r--epan/dissectors/packet-bluetooth.c4
-rw-r--r--epan/dissectors/packet-dcerpc-spoolss.c2
-rw-r--r--epan/dissectors/packet-diameter.c4
-rw-r--r--epan/dissectors/packet-mq.h4
-rw-r--r--epan/dissectors/packet-ncp2222.inc2
-rw-r--r--epan/dissectors/packet-reload.c36
-rw-r--r--epan/dissectors/packet-xml.c4
-rw-r--r--mergecap.c6
-rw-r--r--plugins/wimaxasncp/packet-wimaxasncp.c2
-rw-r--r--randpkt.c4
-rw-r--r--rawshark.c6
-rw-r--r--reordercap.c6
-rw-r--r--text2pcap.c6
-rw-r--r--tfshark.c6
-rw-r--r--tshark.c6
-rw-r--r--ui/gtk/dissector_tables_dlg.c2
-rw-r--r--ui/gtk/drag_and_drop.c2
-rw-r--r--ui/gtk/gui_utils.c2
-rw-r--r--ui/gtk/main.c12
-rw-r--r--ui/tap-rlc-graph.c6
-rw-r--r--wireshark-qt.cpp12
-rw-r--r--wsutil/wsgetopt.c2
29 files changed, 81 insertions, 109 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f3b007698..8b53e7cfc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -359,7 +359,6 @@ else()
-Wignored-qualifiers
-Wpragmas
-Wno-overlength-strings
- -Wwrite-strings
-Wno-long-long
-Wheader-guard
-Wunused-const-variable
diff --git a/capinfos.c b/capinfos.c
index 4742d2adb8..9180678d5c 100644
--- a/capinfos.c
+++ b/capinfos.c
@@ -1394,13 +1394,11 @@ main(int argc, char *argv[])
gchar *err_info;
int opt;
int overall_error_status;
-DIAG_OFF(cast-qual)
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"version", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'v'},
{0, 0, 0, 0 }
};
-DIAG_ON(cast-qual)
int status = 0;
#ifdef HAVE_PLUGINS
diff --git a/capture_opts.h b/capture_opts.h
index 520a0e1e45..eda550e7c9 100644
--- a/capture_opts.h
+++ b/capture_opts.h
@@ -79,7 +79,7 @@ extern "C" {
#ifdef CAN_SET_CAPTURE_BUFFER_SIZE
#define LONGOPT_BUFFER_SIZE \
- {(char *)"buffer-size", required_argument, NULL, 'B'},
+ {"buffer-size", required_argument, NULL, 'B'},
#define OPTSTRING_B "B:"
#else
#define LONGOPT_BUFFER_SIZE
@@ -87,7 +87,7 @@ extern "C" {
#endif
#ifdef HAVE_PCAP_CREATE
-#define LONGOPT_MONITOR_MODE {(char *)"monitor-mode", no_argument, NULL, 'I'},
+#define LONGOPT_MONITOR_MODE {"monitor-mode", no_argument, NULL, 'I'},
#define OPTSTRING_I "I"
#else
#define LONGOPT_MONITOR_MODE
@@ -95,20 +95,20 @@ extern "C" {
#endif
#define LONGOPT_CAPTURE_COMMON \
- {(char *)"capture-comment", required_argument, NULL, LONGOPT_NUM_CAP_COMMENT}, \
- {(char *)"autostop", required_argument, NULL, 'a'}, \
- {(char *)"ring-buffer", required_argument, NULL, 'b'}, \
+ {"capture-comment", required_argument, NULL, LONGOPT_NUM_CAP_COMMENT}, \
+ {"autostop", required_argument, NULL, 'a'}, \
+ {"ring-buffer", required_argument, NULL, 'b'}, \
LONGOPT_BUFFER_SIZE \
- {(char *)"list-interfaces", no_argument, NULL, 'D'}, \
- {(char *)"interface", required_argument, NULL, 'i'}, \
+ {"list-interfaces", no_argument, NULL, 'D'}, \
+ {"interface", required_argument, NULL, 'i'}, \
LONGOPT_MONITOR_MODE \
- {(char *)"list-data-link-types", no_argument, NULL, 'L'}, \
- {(char *)"no-promiscuous-mode", no_argument, NULL, 'p'}, \
- {(char *)"snapshot-length", required_argument, NULL, 's'}, \
- {(char *)"linktype", required_argument, NULL, 'y'}, \
- {(char *)"disable-protocol", required_argument, NULL, LONGOPT_DISABLE_PROTOCOL }, \
- {(char *)"enable-heuristic", required_argument, NULL, LONGOPT_ENABLE_HEURISTIC }, \
- {(char *)"disable-heuristic", required_argument, NULL, LONGOPT_DISABLE_HEURISTIC },
+ {"list-data-link-types", no_argument, NULL, 'L'}, \
+ {"no-promiscuous-mode", no_argument, NULL, 'p'}, \
+ {"snapshot-length", required_argument, NULL, 's'}, \
+ {"linktype", required_argument, NULL, 'y'}, \
+ {"disable-protocol", required_argument, NULL, LONGOPT_DISABLE_PROTOCOL }, \
+ {"enable-heuristic", required_argument, NULL, LONGOPT_ENABLE_HEURISTIC }, \
+ {"disable-heuristic", required_argument, NULL, LONGOPT_DISABLE_HEURISTIC },
#define OPTSTRING_CAPTURE_COMMON \
"a:" OPTSTRING_A "b:" OPTSTRING_B "c:Df:i:" OPTSTRING_I "Lps:y:"
diff --git a/captype.c b/captype.c
index 49cb3e05c5..697ff8a4a4 100644
--- a/captype.c
+++ b/captype.c
@@ -122,13 +122,11 @@ main(int argc, char *argv[])
int i;
int opt;
int overall_error_status;
-DIAG_OFF(cast-qual)
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"version", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'v'},
{0, 0, 0, 0 }
};
-DIAG_ON(cast-qual)
#ifdef HAVE_PLUGINS
char *init_progfile_dir_error;
diff --git a/configure.ac b/configure.ac
index 6330d9a074..1427a6e79c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -964,7 +964,6 @@ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wdiv-by-zero)
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wignored-qualifiers)
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wpragmas)
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wno-overlength-strings)
-AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wwrite-strings)
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wno-long-long)
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wheader-guard)
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wunused-const-variable)
diff --git a/dumpcap.c b/dumpcap.c
index c5e8679b7b..0375d3fa27 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -4317,14 +4317,12 @@ main(int argc, char *argv[])
GString *comp_info_str;
GString *runtime_info_str;
int opt;
-DIAG_OFF(cast-qual)
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"version", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'v'},
LONGOPT_CAPTURE_COMMON
{0, 0, 0, 0 }
};
-DIAG_ON(cast-qual)
gboolean arg_error = FALSE;
diff --git a/editcap.c b/editcap.c
index 3775dbeac5..c8977e0b1c 100644
--- a/editcap.c
+++ b/editcap.c
@@ -920,13 +920,11 @@ main(int argc, char *argv[])
int i, j, read_err, write_err;
gchar *read_err_info, *write_err_info;
int opt;
-DIAG_OFF(cast-qual)
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"version", no_argument, NULL, 'V'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'V'},
{0, 0, 0, 0 }
};
-DIAG_ON(cast-qual)
char *p;
guint32 snaplen = 0; /* No limit */
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;
diff --git a/mergecap.c b/mergecap.c
index 287653621c..ef167d0587 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -254,13 +254,11 @@ main(int argc, char *argv[])
GString *comp_info_str;
GString *runtime_info_str;
int opt;
-DIAG_OFF(cast-qual)
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"version", no_argument, NULL, 'V'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'V'},
{0, 0, 0, 0 }
};
-DIAG_ON(cast-qual)
gboolean do_append = FALSE;
gboolean verbose = FALSE;
int in_file_count = 0;
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c
index be4cd986b1..bafb2fc0d7 100644
--- a/plugins/wimaxasncp/packet-wimaxasncp.c
+++ b/plugins/wimaxasncp/packet-wimaxasncp.c
@@ -133,7 +133,7 @@ wimaxasncp_build_dict_t wimaxasncp_build_dict;
static wimaxasncp_dict_tlv_t wimaxasncp_tlv_not_found =
{
- 0, (char *)"Unknown", NULL, WIMAXASNCP_TLV_UNKNOWN, 0,
+ 0, "Unknown", NULL, WIMAXASNCP_TLV_UNKNOWN, 0,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
NULL, NULL, NULL
};
diff --git a/randpkt.c b/randpkt.c
index e6de985226..ec34a35471 100644
--- a/randpkt.c
+++ b/randpkt.c
@@ -86,12 +86,10 @@ main(int argc, char **argv)
guint8* type = NULL;
int allrandom = FALSE;
wtap_dumper *savedump;
-DIAG_OFF(cast-qual)
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
+ {"help", no_argument, NULL, 'h'},
{0, 0, 0, 0 }
};
-DIAG_ON(cast-qual)
#ifdef _WIN32
arg_list_utf_16to8(argc, argv);
diff --git a/rawshark.c b/rawshark.c
index b3c26eb632..b757124101 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -429,13 +429,11 @@ main(int argc, char *argv[])
GPtrArray *disp_fields = g_ptr_array_new();
guint fc;
gboolean skip_pcap_header = FALSE;
-DIAG_OFF(cast-qual)
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"version", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'v'},
{0, 0, 0, 0 }
};
-DIAG_ON(cast-qual)
#define OPTSTRING_INIT "d:F:hlnN:o:pr:R:sS:t:v"
diff --git a/reordercap.c b/reordercap.c
index 61c3d9c0c0..76bd66d68a 100644
--- a/reordercap.c
+++ b/reordercap.c
@@ -195,13 +195,11 @@ main(int argc, char *argv[])
FrameRecord_t *prevFrame = NULL;
int opt;
-DIAG_OFF(cast-qual)
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"version", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'v'},
{0, 0, 0, 0 }
};
-DIAG_ON(cast-qual)
int file_count;
char *infile;
const char *outfile;
diff --git a/text2pcap.c b/text2pcap.c
index ccc2a187b9..3f002fd86c 100644
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -1531,13 +1531,11 @@ parse_options (int argc, char *argv[])
GString *runtime_info_str;
int c;
char *p;
-DIAG_OFF(cast-qual)
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"version", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'v'},
{0, 0, 0, 0 }
};
-DIAG_ON(cast-qual)
#ifdef _WIN32
arg_list_utf_16to8(argc, argv);
diff --git a/tfshark.c b/tfshark.c
index 310b4a6e30..015184dec9 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -761,13 +761,11 @@ main(int argc, char *argv[])
GString *runtime_info_str;
char *init_progfile_dir_error;
int opt;
-DIAG_OFF(cast-qual)
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"version", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'v'},
{0, 0, 0, 0 }
};
-DIAG_ON(cast-qual)
gboolean arg_error = FALSE;
char *gpf_path, *pf_path;
diff --git a/tshark.c b/tshark.c
index 4896c2ef80..67e64ae9f0 100644
--- a/tshark.c
+++ b/tshark.c
@@ -955,14 +955,12 @@ main(int argc, char *argv[])
GString *runtime_info_str;
char *init_progfile_dir_error;
int opt;
-DIAG_OFF(cast-qual)
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"version", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'v'},
LONGOPT_CAPTURE_COMMON
{0, 0, 0, 0 }
};
-DIAG_ON(cast-qual)
gboolean arg_error = FALSE;
#ifdef _WIN32
diff --git a/ui/gtk/dissector_tables_dlg.c b/ui/gtk/dissector_tables_dlg.c
index aff3936f9e..d400a5d231 100644
--- a/ui/gtk/dissector_tables_dlg.c
+++ b/ui/gtk/dissector_tables_dlg.c
@@ -156,7 +156,7 @@ decode_proto_add_to_list (const gchar *table_name _U_, ftenum_t selector_type,
str = (gchar*)dissector_handle_get_dissector_name(handle);
if (str == NULL)
{
- str = (gchar*)"<Unknown>";
+ str = "<Unknown>";
}
proto_add_to_list(tree_info, store, str, proto_name);
break;
diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c
index e7ea594ac6..e1cae02d79 100644
--- a/ui/gtk/drag_and_drop.c
+++ b/ui/gtk/drag_and_drop.c
@@ -316,7 +316,7 @@ dnd_init(GtkWidget *w)
static GtkTargetEntry target_entry[] = {
/*{"STRING", 0, DND_TARGET_STRING},*/
/*{"text/plain", 0, DND_TARGET_STRING},*/
- {(gchar *)"text/uri-list", 0, DND_TARGET_URL}
+ {"text/uri-list", 0, DND_TARGET_URL}
};
/* set this window as a dnd destination */
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c
index d00d6095b6..66127274b0 100644
--- a/ui/gtk/gui_utils.c
+++ b/ui/gtk/gui_utils.c
@@ -1093,7 +1093,7 @@ copy_binary_to_clipboard(const guint8 *data_p,
int len)
{
static GtkTargetEntry target_entry[] = {
- {(char *)"application/octet-stream", 0, 0}};
+ {"application/octet-stream", 0, 0}};
/* XXX - this is not understood by most applications,
* but can be pasted into the better hex editors - is
* there something better that we can do?
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index c3fe025305..7a40b467dd 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -2231,17 +2231,15 @@ main(int argc, char *argv[])
GSList *disable_heur_slist = NULL;
#define OPTSTRING OPTSTRING_CAPTURE_COMMON "C:g:Hh" "jJ:kK:lm:nN:o:P:r:R:St:u:vw:X:Y:z:"
-DIAG_OFF(cast-qual)
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"read-file", required_argument, NULL, 'r' },
- {(char *)"read-filter", required_argument, NULL, 'R' },
- {(char *)"display-filter", required_argument, NULL, 'Y' },
- {(char *)"version", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {"read-file", required_argument, NULL, 'r' },
+ {"read-filter", required_argument, NULL, 'R' },
+ {"display-filter", required_argument, NULL, 'Y' },
+ {"version", no_argument, NULL, 'v'},
LONGOPT_CAPTURE_COMMON
{0, 0, 0, 0 }
};
-DIAG_ON(cast-qual)
static const char optstring[] = OPTSTRING;
#ifdef HAVE_GRESOURCE
diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c
index 64175b51dd..20b8a582ca 100644
--- a/ui/tap-rlc-graph.c
+++ b/ui/tap-rlc-graph.c
@@ -156,7 +156,7 @@ rlc_lte_tap_info *select_rlc_lte_session(capture_file *cf,
/* This "shouldn't happen", as the graph menu items won't
* even be enabled if the selected packet isn't an RLC PDU.
*/
- *err_msg = (char*)"Selected packet doesn't have an RLC PDU";
+ *err_msg = "Selected packet doesn't have an RLC PDU";
*free_err_msg = FALSE;
return NULL;
}
@@ -164,7 +164,7 @@ rlc_lte_tap_info *select_rlc_lte_session(capture_file *cf,
* to select which session he wants here */
if (th.num_hdrs>1){
/* Can only handle a single RLC channel yet */
- *err_msg = (char*)"The selected packet has more than one LTE RLC channel in it.";
+ *err_msg = "The selected packet has more than one LTE RLC channel in it.";
*free_err_msg = FALSE;
return NULL;
}
@@ -294,7 +294,7 @@ gboolean rlc_graph_segment_list_get(capture_file *cf, struct rlc_graph *g, gbool
remove_tap_listener(g);
if (g->last_segment == NULL) {
- *err_string = (char*)"No packets found";
+ *err_string = "No packets found";
*free_err_string = FALSE;
return FALSE;
}
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index 4033b5d201..18605ff80d 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -616,17 +616,15 @@ int main(int argc, char *argv[])
*/
// XXX Should the remaining code be in WiresharkApplcation::WiresharkApplication?
#define OPTSTRING OPTSTRING_CAPTURE_COMMON "C:g:Hh" "jJ:kK:lm:nN:o:P:r:R:St:u:vw:X:Y:z:"
-DIAG_OFF(cast-qual)
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"read-file", required_argument, NULL, 'r' },
- {(char *)"read-filter", required_argument, NULL, 'R' },
- {(char *)"display-filter", required_argument, NULL, 'Y' },
- {(char *)"version", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {"read-file", required_argument, NULL, 'r' },
+ {"read-filter", required_argument, NULL, 'R' },
+ {"display-filter", required_argument, NULL, 'Y' },
+ {"version", no_argument, NULL, 'v'},
LONGOPT_CAPTURE_COMMON
{0, 0, 0, 0 }
};
-DIAG_ON(cast-qual)
static const char optstring[] = OPTSTRING;
opterr = 0;
diff --git a/wsutil/wsgetopt.c b/wsutil/wsgetopt.c
index eac72d5af4..5302bc7563 100644
--- a/wsutil/wsgetopt.c
+++ b/wsutil/wsgetopt.c
@@ -820,7 +820,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
}
#endif
}
- d->__nextchar = (char *) "";
+ d->__nextchar = "";
d->optind++;
d->optopt = 0;
return '?';
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 23:16:06 +0000