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

svn path=/trunk/; revision=46849
This commit is contained in:
Bill Meier 2012-12-29 20:56:11 +00:00
parent 1a97d3395a
commit 7dfa337910
5 changed files with 7 additions and 6 deletions

View File

@ -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)
{

View File

@ -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);

View File

@ -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;

View File

@ -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;
}

View File

@ -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__ */