From 7dfa337910164ea684d7005f3b3ead74cd543f0e Mon Sep 17 00:00:00 2001
From: Bill Meier <wmeier@newsguy.com>
Date: Sat, 29 Dec 2012 20:56:11 +0000
Subject: [PATCH] Add a few consts to fix some compiler (GCC) errors.

svn path=/trunk/; revision=46849
---
 capture_sync.c              | 2 +-
 capture_sync.h              | 2 +-
 ui/gtk/main_80211_toolbar.c | 3 ++-
 ws80211_utils.c             | 4 ++--
 ws80211_utils.h             | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/capture_sync.c b/capture_sync.c
index 1bec93fcd6..b0a1bc2464 100644
--- a/capture_sync.c
+++ b/capture_sync.c
@@ -1115,7 +1115,7 @@ sync_pipe_run_command(const char** argv, gchar **data, gchar **primary_msg,
 }
 
 int
-sync_interface_set_80211_chan(gchar *iface, char *freq, gchar *type,
+sync_interface_set_80211_chan(const gchar *iface, const char *freq, const gchar *type,
                               gchar **data, gchar **primary_msg,
                               gchar **secondary_msg)
 {
diff --git a/capture_sync.h b/capture_sync.h
index 4d9ac967d6..92888c9449 100644
--- a/capture_sync.h
+++ b/capture_sync.h
@@ -59,7 +59,7 @@ sync_pipe_kill(int fork_child);
 
 /** Set wireless channel using dumpcap */
 extern int
-sync_interface_set_80211_chan(gchar *iface, char *freq, gchar *type,
+sync_interface_set_80211_chan(const gchar *iface, const char *freq, const gchar *type,
                               gchar **data, gchar **primary_msg,
                               gchar **secondary_msg);
 
diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c
index 713f105f86..5cfcb3a599 100644
--- a/ui/gtk/main_80211_toolbar.c
+++ b/ui/gtk/main_80211_toolbar.c
@@ -165,7 +165,8 @@ int get_selected_channel_type(void)
 static int
 tb80211_do_set_channel(char *iface, int freq, int type)
 {
-	gchar *freq_s, *type_s;
+	gchar *freq_s;
+	const gchar *type_s;
 	gchar *data, *primary_msg, *secondary_msg;
 	int ret;
 
diff --git a/ws80211_utils.c b/ws80211_utils.c
index 6e26f557a8..d749e1eb91 100644
--- a/ws80211_utils.c
+++ b/ws80211_utils.c
@@ -650,7 +650,7 @@ ws80211_str_to_chan_type(const gchar *s)
 	return ret;
 }
 
-gchar
+const gchar
 *ws80211_chan_type_to_str(int type)
 {
 	switch (type) {
@@ -701,7 +701,7 @@ int ws80211_str_to_chan_type(const gchar *s _U_)
 	return -1;
 }
 
-gchar *ws80211_chan_type_to_str(int type _U_)
+const gchar *ws80211_chan_type_to_str(int type _U_)
 {
 	return NULL;
 }
diff --git a/ws80211_utils.h b/ws80211_utils.h
index 9271b3ae04..86eccb8169 100644
--- a/ws80211_utils.h
+++ b/ws80211_utils.h
@@ -60,6 +60,6 @@ void ws80211_free_interfaces(GArray *interfaces);
 int ws80211_frequency_to_channel(int freq);
 int ws80211_set_freq(const char *name, int freq, int chan_type);
 int ws80211_str_to_chan_type(const gchar *s);
-gchar *ws80211_chan_type_to_str(int type);
+const gchar *ws80211_chan_type_to_str(int type);
 
 #endif /* __WS80211_UTILS_H__ */