Have (almost) all preferences use the generic preferences API (per https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7402). This cleaned up a lot of hardcoded code and allows breaking up the prefs structure (or at least prevent it from growing too large) if desired.

Bugfixed problems mentioned in
http://www.wireshark.org/lists/wireshark-dev/201208/msg00001.html

Column preferences now support default '#' character

svn path=/trunk/; revision=44348

1 files changed, 1 insertions, 1 deletions

diff --git a/tshark.c b/tshark.c
index c7bf0095c9..6a53f1b10e 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1791,7 +1791,7 @@ main(int argc, char *argv[])
 #ifdef HAVE_LIBPCAP
     /* trim the interface name and exit if that failed */
     if (!capture_opts_trim_iface(&global_capture_opts,
-        (prefs_p->capture_device) ? get_if_name(prefs_p->capture_device) : NULL)) {
+        ((prefs_p->capture_device) && (*prefs_p->capture_device != '\0')) ? get_if_name(prefs_p->capture_device) : NULL)) {
         return 2;
     }