uaudp: removed old/unused code (#if 0...#endif)

[metze/wireshark/wip.git] / trigcap.c

diff --git a/trigcap.c b/trigcap.c
index 370bf77564eec2fbbc5a56973acb872662560233..9086b5897ff961965baac2f451546708c8bcae57 100644 (file)
--- a/trigcap.c
+++ b/trigcap.c
@@ -2,24 +2,9 @@
  * trigcap
  * a simple triggered libpcap-based capture agent
  *
- * $Id$
- *
  * (c) 2007, Luis E. Garcia Ontanon <luis@ontanon.org>
  *
- * 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.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <stdio.h>
@@ -29,7 +14,8 @@
 #include <signal.h>
 #include <errno.h>
 #include <getopt.h>
-#include <pcap.h>
+
+#include <wsutil/wspcap.h>
 
 static int dumping;
 static volatile int keep_going;
@@ -49,12 +35,12 @@ static void panic(int err, const char* fmt, ...) {
 static void dprintf(int lev, const char* fmt, ...) {
        va_list ap;
 
-       va_start(ap,fmt);
        if (lev <= debug_level) {
+               va_start(ap,fmt);
                vfprintf(stderr,fmt,ap);
+               va_end(ap);
                fflush(stderr);
        }
-       va_end(ap);
 }
 
 
@@ -68,7 +54,7 @@ static void usage(int err) {
        "   -p promiscuous mode\n"
        "   -s snapshot length\n"
        "   -q quiet\n"
-       "   -d increase deug level\n"
+       "   -d increase debug level\n"
        "   -h prints this message\n"
        ;
 
@@ -115,7 +101,7 @@ int main(int argc, char** argv) {
        char errbuf[PCAP_ERRBUF_SIZE];
        char* interface = NULL;
        char* outfile = NULL;
-       unsigned snaplen = 65536;
+       guint snaplen = 65536;
        char* start_filter_str = NULL;
        char* stop_filter_str = NULL;
        char* capture_filter_str = NULL;
@@ -172,7 +158,7 @@ int main(int argc, char** argv) {
 
        dprintf(1,"starting with:\n interface: %s\n snaplen: %d\n promisc: %d"
                        "\n outfile: %s\n capture filter: %s\n start: %s\n stop: %s\n debug level: %d\n",
-                       interface ? interface : "to be choosen",
+                       interface ? interface : "to be chosen",
                        snaplen,
                        promisc,
                        outfile ? outfile : "** missing **",
@@ -292,3 +278,16 @@ int main(int argc, char** argv) {
 
        return 0;
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */