From 15501fad2a11db5de5926400965ddb5d665ba651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=BCxen?= Date: Thu, 7 Mar 2013 12:06:55 +0000 Subject: [PATCH] Try to fix the buildbots. The patch for capture_dlg.c is from Anders... svn path=/trunk/; revision=48164 --- epan/prefs.c | 2 ++ ui/gtk/capture_dlg.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epan/prefs.c b/epan/prefs.c index 5b2f6cc7ff..9f8461cc54 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -2180,9 +2180,11 @@ prefs_register_modules(void) "By default, capture in monitor mode on interface? (Ex: eth0,eth3,...)", (const char**)(&prefs.capture_devices_monitor_mode)); +#if defined(_WIN32) || defined(HAVE_PCAP_CREATE) prefs_register_string_preference(capture_module, "devices_buffersize", "Interface buffer size", "Interface buffer size (Ex: en0(1),en1(143),...)", (const char**)(&prefs.capture_devices_buffersize)); +#endif prefs_register_string_preference(capture_module, "devices_snaplen", "Interface snap length", "Interface snap length (Ex: en0(65535),en1(1430),...)", diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c index dadae7ec32..c5953d53cc 100644 --- a/ui/gtk/capture_dlg.c +++ b/ui/gtk/capture_dlg.c @@ -1248,14 +1248,14 @@ insert_new_rows(GList *list) device.display_name = g_strdup(if_string); } #if defined(_WIN32) || defined(HAVE_PCAP_CREATE) - if ((device.buffer = capture_dev_user_buffersize_find(if_string->name)) == -1) { + if ((device.buffer = capture_dev_user_buffersize_find(if_string)) == -1) { device.buffer = global_capture_opts.default_options.buffer_size; } #endif device.pmode = global_capture_opts.default_options.promisc_mode; device.has_snaplen = global_capture_opts.default_options.has_snaplen; device.snap_pref = TRUE; - if ((device.snaplen = capture_dev_user_buffersize_find(if_string->name)) == -1) { + if ((device.snaplen = capture_dev_user_buffersize_find(if_string)) == -1) { device.snaplen = global_capture_opts.default_options.snaplen; } device.cfilter = g_strdup(global_capture_opts.default_options.cfilter);