Add a few consts to fix some compiler (GCC) errors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@46849 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/capture_sync.c b/capture_sync.c
index 1bec93fcd6d349dbce1185ba9e99efefebf856ad..b0a1bc2464522f883324a0a824fdb1a442e0ec4a 100644 (file)
--- 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 4d9ac967d6aff5cb155e72acf2e2dac7b8772f3b..92888c944998abfb204ef5d5badbeeac7b85e0fb 100644 (file)
--- 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 713f105f863bbee84726168e754fd4a305e75bd0..5cfcb3a59962c049fe93b41d931c14eb9cbe7030 100644 (file)
--- 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 6e26f557a8fac8360a483782be7c3d15baee0bc0..d749e1eb91fc483d6c2c366bc0bfda8299031b6c 100644 (file)
--- 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 9271b3ae0433af9e962b0fb0af495506eb2ae9e6..86eccb81698c76a73f4283df6b6e66c9ac35eec4 100644 (file)
--- 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__ */