aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2019-03-17 17:20:40 -0700
committerGuy Harris <guy@alum.mit.edu>2019-03-18 00:21:12 +0000
commit946c8505418a025bd8e17be8a70ac2effa1be071 (patch)
tree11e020973f06c8386eee1f8e214caefa5a0dea76
parent4a9c6863221e746f4e9fcc5508f692e5dc5de936 (diff)
More constification, to squelch warnings.
capture_input_drops() doesn't, and shouldn't, modify or free or... the interface name, so make the pointer to it a const pointer. Change-Id: Iafc5c5dd9939225b3aeb8a8e36c5bdeecc394e12 Reviewed-on: https://code.wireshark.org/review/32465 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--capchild/capture_sync.c2
-rw-r--r--capchild/capture_sync.h2
-rw-r--r--tshark.c2
-rw-r--r--ui/capture.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
index 25879ebdfb..4991bed501 100644
--- a/capchild/capture_sync.c
+++ b/capchild/capture_sync.c
@@ -1724,7 +1724,7 @@ sync_pipe_input_cb(gint source, gpointer user_data)
name = end + 1;
}
- capture_input_drops(cap_session, num, (char*)name);
+ capture_input_drops(cap_session, num, name);
break;
}
default:
diff --git a/capchild/capture_sync.h b/capchild/capture_sync.h
index dafd787a4e..b448b060e0 100644
--- a/capchild/capture_sync.h
+++ b/capchild/capture_sync.h
@@ -121,7 +121,7 @@ capture_input_new_packets(capture_session *cap_session, int to_read);
* Capture child told us how many dropped packets it counted.
*/
extern void
-capture_input_drops(capture_session *cap_session, guint32 dropped, char* interface_name);
+capture_input_drops(capture_session *cap_session, guint32 dropped, const char* interface_name);
/**
* Capture child told us that an error has occurred while starting the capture.
diff --git a/tshark.c b/tshark.c
index ae39a3d251..6947c45e99 100644
--- a/tshark.c
+++ b/tshark.c
@@ -2781,7 +2781,7 @@ report_counts_siginfo(int signum _U_)
/* capture child detected any packet drops? */
void
-capture_input_drops(capture_session *cap_session _U_, guint32 dropped, char* interface_name)
+capture_input_drops(capture_session *cap_session _U_, guint32 dropped, const char* interface_name)
{
if (print_packet_counts) {
/* We're printing packet counts to stderr.
diff --git a/ui/capture.c b/ui/capture.c
index 8e99e93253..002160c262 100644
--- a/ui/capture.c
+++ b/ui/capture.c
@@ -515,7 +515,7 @@ capture_input_new_packets(capture_session *cap_session, int to_read)
/* Capture child told us how many dropped packets it counted.
*/
void
-capture_input_drops(capture_session *cap_session, guint32 dropped, char* interface_name)
+capture_input_drops(capture_session *cap_session, guint32 dropped, const char* interface_name)
{
if (interface_name != NULL) {
g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_INFO, "%u packet%s dropped from %s", dropped, plurality(dropped, "", "s"), interface_name);