osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compilation warnings. 

svn path=/trunk/; revision=44489
This commit is contained in:
Gerald Combs 2012-08-14 16:01:47 +00:00
parent f929edfe09
commit 6f55c03852
5 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/qt/capture_info_dialog.cpp
View File

@ -38,6 +38,8 @@ void capture_info_ui_create(
capture_info *cinfo, capture_info *cinfo,
capture_options *capture_opts) capture_options *capture_opts)
{ {
Q_UNUSED(cinfo);
Q_UNUSED(capture_opts);
g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: capture_info_ui_create"); g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: capture_info_ui_create");
} }
@ -47,6 +49,7 @@ capture_options *capture_opts)
void capture_info_ui_update( void capture_info_ui_update(
capture_info *cinfo) capture_info *cinfo)
{ {
Q_UNUSED(cinfo);
g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: capture_info_ui_update"); g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: capture_info_ui_update");
} }
@ -54,6 +57,7 @@ capture_info *cinfo)
void capture_info_ui_destroy( void capture_info_ui_destroy(
capture_info *cinfo) capture_info *cinfo)
{ {
Q_UNUSED(cinfo);
g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: capture_info_ui_destroy"); g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: capture_info_ui_destroy");
} }

2
ui/qt/color_dialog.cpp
View File

@ -40,6 +40,8 @@
void void
color_filter_add_cb(color_filter_t *colorf, gpointer user_data) color_filter_add_cb(color_filter_t *colorf, gpointer user_data)
{ {
Q_UNUSED(colorf);
Q_UNUSED(user_data);
g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: color_filter_add_cb"); g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: color_filter_add_cb");
// GtkWidget *color_filters = user_data; // GtkWidget *color_filters = user_data;

33
ui/qt/main.cpp
View File

@ -154,6 +154,11 @@ extern capture_options global_capture_opts;
// Copied from ui/gtk/gui_utils.c // Copied from ui/gtk/gui_utils.c
void pipe_input_set_handler(gint source, gpointer user_data, int *child_process, pipe_input_cb_t input_cb) void pipe_input_set_handler(gint source, gpointer user_data, int *child_process, pipe_input_cb_t input_cb)
{ {
Q_UNUSED(source);
Q_UNUSED(user_data);
Q_UNUSED(child_process);
Q_UNUSED(input_cb);
// static pipe_input_t pipe_input; // static pipe_input_t pipe_input;
// pipe_input.source = source; // pipe_input.source = source;
@ -619,12 +624,12 @@ int main(int argc, char *argv[])
MainWindow *w; MainWindow *w;
char *init_progfile_dir_error; char *init_progfile_dir_error;
char *s; // char *s;
int opt; int opt;
gboolean arg_error = FALSE; // gboolean arg_error = FALSE;
extern int info_update_freq; /* Found in about_dlg.c. */ // extern int info_update_freq; /* Found in about_dlg.c. */
const gchar *filter; // const gchar *filter;
#ifdef _WIN32 #ifdef _WIN32
WSADATA wsaData; WSADATA wsaData;
@ -635,8 +640,8 @@ int main(int argc, char *argv[])
char *gdp_path, *dp_path; char *gdp_path, *dp_path;
int err; int err;
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
gboolean start_capture = FALSE; // gboolean start_capture = FALSE;
gboolean list_link_layer_types = FALSE; // gboolean list_link_layer_types = FALSE;
GList *if_list; GList *if_list;
gchar *err_str; gchar *err_str;
#else #else
@ -647,17 +652,17 @@ int main(int argc, char *argv[])
#endif #endif
#endif #endif
#endif #endif
gint pl_size = 280, tv_size = 95, bv_size = 75; // gint pl_size = 280, tv_size = 95, bv_size = 75;
gchar *rc_file, *cf_name = NULL, *rfilter = NULL, *jfilter = NULL; // gchar *rc_file, *cf_name = NULL, *rfilter = NULL, *jfilter = NULL;
dfilter_t *rfcode = NULL; // dfilter_t *rfcode = NULL;
gboolean rfilter_parse_failed = FALSE; // gboolean rfilter_parse_failed = FALSE;
e_prefs *prefs_p; e_prefs *prefs_p;
char badopt; // char badopt;
//GtkWidget *splash_win = NULL; //GtkWidget *splash_win = NULL;
GLogLevelFlags log_flags; GLogLevelFlags log_flags;
guint go_to_packet = 0; // guint go_to_packet = 0;
gboolean jump_backwards = FALSE; // gboolean jump_backwards = FALSE;
dfilter_t *jump_to_filter = NULL; // dfilter_t *jump_to_filter = NULL;
int optind_initial; int optind_initial;
int status; int status;

2
ui/qt/main_welcome.cpp
View File

@ -202,7 +202,7 @@ void MainWelcome::updateRecentFiles() {
rfRow++; rfRow++;
} }
while (m_recent_files.count() > prefs.gui_recent_files_count_max) { while (m_recent_files.count() > (int) prefs.gui_recent_files_count_max) {
m_recent_files.takeItem(m_recent_files.count()); m_recent_files.takeItem(m_recent_files.count());
} }
} }

2
ui/win32/file_dlg_win32.c
View File

@ -1398,7 +1398,7 @@ preview_set_file_info(HWND of_hwnd, gchar *preview_file) {
double cur_time; double cur_time;
gboolean is_breaked = FALSE; gboolean is_breaked = FALSE;
for (i = EWFD_PT_FORMAT; i <= EWFD_PTX_ELAPSED; i++) { for (i = EWFD_PTX_FORMAT; i <= EWFD_PTX_ELAPSED; i++) {
cur_ctrl = GetDlgItem(of_hwnd, i); cur_ctrl = GetDlgItem(of_hwnd, i);
if (cur_ctrl) { if (cur_ctrl) {
EnableWindow(cur_ctrl, FALSE); EnableWindow(cur_ctrl, FALSE);