CMakeLists.txt: Make sure TSHARK_TAP_SRC is defined before
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 12 Jan 2012 19:16:15 +0000 (19:16 +0000)
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 12 Jan 2012 19:16:15 +0000 (19:16 +0000)
register_tap_files so that the "-z" flag works for TShark.

epan/stat_cmd_args.c: Fixup whitespace.

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

CMakeLists.txt
epan/stat_cmd_args.c

index 29f1da6fccb9f01ecfc7105a67b9371282fbb088..630c2d754569779bcbe9ca91b9a919d746bbb7f7 100644 (file)
@@ -495,10 +495,6 @@ ADD_CUSTOM_COMMAND(
                ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
 )
 
-register_tap_files(tshark-tap-register.c
-       ${TSHARK_TAP_SRC}
-)
-
 ADD_CUSTOM_COMMAND(
        OUTPUT  ps.c
        COMMAND ${PYTHON_EXECUTABLE}
@@ -688,6 +684,10 @@ if(BUILD_wireshark AND GTK_FOUND)
        install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
+register_tap_files(tshark-tap-register.c
+       ${TSHARK_TAP_SRC}
+)
+
 if(BUILD_tshark)
        set(tshark_LIBS
                ${LIBEPAN_LIBS}
index 07848d4ea2840bad55027d997096c90ddc17f6aa..b2e23df920a91b3e1437985015c08d1899911ac9 100644 (file)
@@ -6,17 +6,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -72,7 +72,7 @@ register_stat_cmd_arg(const char *cmd, void (*func)(const char*, void*),void* us
        newsca=g_malloc(sizeof(stat_cmd_arg));
        newsca->cmd=cmd;
        newsca->func=func;
-    newsca->userdata=userdata;
+       newsca->userdata=userdata;
        stat_cmd_arg_list=g_slist_insert_sorted(stat_cmd_arg_list, newsca,
            sort_by_name);
 }