From b8a9e53262ab24231542e9ce93daadaf3809dac2 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 12 Dec 2014 16:26:32 +0100 Subject: all: Reduce amount of empty liens in usage and version output a bit No need for some of the empty lines, remove them to make the output a bit denser. Signed-off-by: Tobias Klauser --- astraceroute.c | 10 +++++----- bpfc.c | 10 +++++----- curvetun.c | 4 ++-- flowtop.c | 10 +++++----- ifpps.c | 10 +++++----- netsniff-ng.c | 10 +++++----- trafgen.c | 10 +++++----- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/astraceroute.c b/astraceroute.c index cef668a..a801ab1 100644 --- a/astraceroute.c +++ b/astraceroute.c @@ -122,7 +122,7 @@ static const char *copyright = "Please report bugs to \n" "Swiss federal institute of technology (ETH Zurich)\n" "License: GNU GPL version 2.0\n" "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n"; + "There is NO WARRANTY, to the extent permitted by law."; static const struct sock_filter ipv4_icmp_type_11[] = { { 0x28, 0, 0, 0x0000000c }, /* ldh [12] */ @@ -184,7 +184,7 @@ static void signal_handler(int number) static void __noreturn help(void) { - printf("\nastraceroute %s, autonomous system trace route utility\n", VERSION_STRING); + printf("astraceroute %s, autonomous system trace route utility\n", VERSION_STRING); puts("http://www.netsniff-ng.org\n\n" "Usage: astraceroute [options]\n" "Options:\n" @@ -233,16 +233,16 @@ static void __noreturn help(void) " If the TCP probe did not give any results, then astraceroute will\n" " automatically probe for classic ICMP packets! To gather more\n" " information about astraceroute's fetched AS numbers, see e.g.\n" - " http://bgp.he.net/AS!\n\n"); + " http://bgp.he.net/AS!\n"); puts(copyright); die(); } static void __noreturn version(void) { - printf("\nastraceroute %s, Git id: %s\n", VERSION_LONG, GITVERSION); + printf("astraceroute %s, Git id: %s\n", VERSION_LONG, GITVERSION); puts("autonomous system trace route utility\n" - "http://www.netsniff-ng.org\n\n"); + "http://www.netsniff-ng.org\n"); puts(copyright); die(); } diff --git a/bpfc.c b/bpfc.c index f56ec0d..c659e3f 100644 --- a/bpfc.c +++ b/bpfc.c @@ -36,14 +36,14 @@ static const char *copyright = "Please report bugs to \n" "Swiss federal institute of technology (ETH Zurich)\n" "License: GNU GPL version 2.0\n" "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n"; + "There is NO WARRANTY, to the extent permitted by law."; extern int compile_filter(char *file, int verbose, int bypass, int format, bool invoke_cpp); static void __noreturn help(void) { - printf("\nbpfc %s, a tiny BPF compiler\n", VERSION_STRING); + printf("bpfc %s, a tiny BPF compiler\n", VERSION_STRING); puts("http://www.netsniff-ng.org\n\n" "Usage: bpfc [options] || bpfc \n" "Options:\n" @@ -63,16 +63,16 @@ static void __noreturn help(void) " iptables -A INPUT -m bpf --bytecode \"`./bpfc -f xt_bpf -i fubar`\" -j LOG\n" " bpfc - (read from stdin)\n" "Note:\n" - " Generation of seccomp-BPF filters are fully supported as well.\n\n"); + " Generation of seccomp-BPF filters are fully supported as well.\n"); puts(copyright); die(); } static void __noreturn version(void) { - printf("\nbpfc %s, Git id: %s\n", VERSION_LONG, GITVERSION); + printf("bpfc %s, Git id: %s\n", VERSION_LONG, GITVERSION); puts("a tiny BPF compiler\n" - "http://www.netsniff-ng.org\n\n"); + "http://www.netsniff-ng.org\n"); puts(copyright); die(); } diff --git a/curvetun.c b/curvetun.c index f44cb80..52bfb44 100644 --- a/curvetun.c +++ b/curvetun.c @@ -87,7 +87,7 @@ static void signal_handler(int number) static void __noreturn help(void) { - printf("\ncurvetun %s, lightweight curve25519-based IP tunnel\n", VERSION_STRING); + printf("curvetun %s, lightweight curve25519-based IP tunnel\n", VERSION_STRING); puts("http://www.netsniff-ng.org\n\n" "Usage: curvetun [options]\n" "Options, general:\n" @@ -129,7 +129,7 @@ static void __noreturn help(void) static void __noreturn version(void) { - printf("\ncurvetun %s, Git id: %s\n", VERSION_LONG, GITVERSION); + printf("curvetun %s, Git id: %s\n", VERSION_LONG, GITVERSION); puts("lightweight curve25519-based IP tunnel\n" "Note: Einstein-Rosen bridge not yet supported\n" "http://www.netsniff-ng.org\n\n" diff --git a/flowtop.c b/flowtop.c index c2d9db9..2db5772 100644 --- a/flowtop.c +++ b/flowtop.c @@ -103,7 +103,7 @@ static const char *copyright = "Please report bugs to \n" "Swiss federal institute of technology (ETH Zurich)\n" "License: GNU GPL version 2.0\n" "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n"; + "There is NO WARRANTY, to the extent permitted by law."; static const char *const l3proto2str[AF_MAX] = { [AF_INET] = "ipv4", @@ -235,7 +235,7 @@ static void flow_entry_get_extended(struct flow_entry *n); static void help(void) { - printf("\nflowtop %s, top-like netfilter TCP/UDP/SCTP/.. flow tracking\n", + printf("flowtop %s, top-like netfilter TCP/UDP/SCTP/.. flow tracking\n", VERSION_STRING); puts("http://www.netsniff-ng.org\n\n" "Usage: flowtop [options]\n" @@ -257,16 +257,16 @@ static void help(void) "Note:\n" " If netfilter is not running, you can activate it with e.g.:\n" " iptables -A INPUT -p tcp -m state --state ESTABLISHED -j ACCEPT\n" - " iptables -A OUTPUT -p tcp -m state --state NEW,ESTABLISHED -j ACCEPT\n\n"); + " iptables -A OUTPUT -p tcp -m state --state NEW,ESTABLISHED -j ACCEPT\n"); puts(copyright); die(); } static void version(void) { - printf("\nflowtop %s, Git id: %s\n", VERSION_LONG, GITVERSION); + printf("flowtop %s, Git id: %s\n", VERSION_LONG, GITVERSION); puts("top-like netfilter TCP/UDP/SCTP/.. flow tracking\n" - "http://www.netsniff-ng.org\n\n"); + "http://www.netsniff-ng.org\n"); puts(copyright); die(); } diff --git a/ifpps.c b/ifpps.c index 7dc8e68..e70e8a6 100644 --- a/ifpps.c +++ b/ifpps.c @@ -99,7 +99,7 @@ static const char *copyright = "Please report bugs to \n" "Copyright (C) 2013 Tobias Klauser \n" "License: GNU GPL version 2.0\n" "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n"; + "There is NO WARRANTY, to the extent permitted by law."; static void signal_handler(int number) { @@ -122,7 +122,7 @@ static inline int iswireless(const struct ifstat *stats) static void __noreturn help(void) { - printf("\nifpps %s, top-like kernel networking and system statistics\n", + printf("ifpps %s, top-like kernel networking and system statistics\n", VERSION_STRING); puts("http://www.netsniff-ng.org\n\n" "Usage: ifpps [options] || ifpps \n" @@ -145,16 +145,16 @@ static void __noreturn help(void) " ifpps -lpcd wlan0 > plot.dat\n\n" "Note:\n" " On 10G cards, RX/TX statistics are usually accumulated each > 1sec.\n" - " Thus, in those situations, it's good to use a -t of 10sec.\n\n"); + " Thus, in those situations, it's good to use a -t of 10sec.\n"); puts(copyright); die(); } static void __noreturn version(void) { - printf("\nifpps %s, Git id: %s\n", VERSION_LONG, GITVERSION); + printf("ifpps %s, Git id: %s\n", VERSION_LONG, GITVERSION); puts("top-like kernel networking and system statistics\n" - "http://www.netsniff-ng.org\n\n"); + "http://www.netsniff-ng.org\n"); puts(copyright); die(); } diff --git a/netsniff-ng.c b/netsniff-ng.c index 427b5e9..477c81d 100644 --- a/netsniff-ng.c +++ b/netsniff-ng.c @@ -112,7 +112,7 @@ static const char *copyright = "Please report bugs to \n" "Swiss federal institute of technology (ETH Zurich)\n" "License: GNU GPL version 2.0\n" "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n"; + "There is NO WARRANTY, to the extent permitted by law."; static int tx_sock; static struct itimerval itimer; @@ -1089,7 +1089,7 @@ static void destroy_ctx(struct ctx *ctx) static void __noreturn help(void) { - printf("\nnetsniff-ng %s, the packet sniffing beast\n", VERSION_STRING); + printf("netsniff-ng %s, the packet sniffing beast\n", VERSION_STRING); puts("http://www.netsniff-ng.org\n\n" "Usage: netsniff-ng [options] [filter-expression]\n" "Options:\n" @@ -1138,16 +1138,16 @@ static void __noreturn help(void) " netsniff-ng --in any --filter http.bpf --jumbo-support --ascii -V\n\n" "Note:\n" " For introducing bit errors, delays with random variation and more\n" - " while replaying pcaps, make use of tc(8) with its disciplines (e.g. netem).\n\n"); + " while replaying pcaps, make use of tc(8) with its disciplines (e.g. netem).\n"); puts(copyright); die(); } static void __noreturn version(void) { - printf("\nnetsniff-ng %s, Git id: %s\n", VERSION_LONG, GITVERSION); + printf("netsniff-ng %s, Git id: %s\n", VERSION_LONG, GITVERSION); puts("the packet sniffing beast\n" - "http://www.netsniff-ng.org\n\n"); + "http://www.netsniff-ng.org\n"); puts(copyright); die(); } diff --git a/trafgen.c b/trafgen.c index 52d9804..0a645d4 100644 --- a/trafgen.c +++ b/trafgen.c @@ -117,7 +117,7 @@ static const char *copyright = "Please report bugs to \n" "Swiss federal institute of technology (ETH Zurich)\n" "License: GNU GPL version 2.0\n" "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n"; + "There is NO WARRANTY, to the extent permitted by law."; static int sock; static struct cpu_stats *stats; @@ -152,7 +152,7 @@ static void signal_handler(int number) static void __noreturn help(void) { - printf("\ntrafgen %s, multithreaded zero-copy network packet generator\n", VERSION_STRING); + printf("trafgen %s, multithreaded zero-copy network packet generator\n", VERSION_STRING); puts("http://www.netsniff-ng.org\n\n" "Usage: trafgen [options]\n" "Options:\n" @@ -206,7 +206,7 @@ static void __noreturn help(void) " Tolly 64:55, 78:5, 576:17, 1518:23\n" " Cisco 64:7, 594:4, 1518:1\n" " RPR Trimodal 64:60, 512:20, 1518:20\n" - " RPR Quadrimodal 64:50, 512:15, 1518:15, 9218:20\n\n"); + " RPR Quadrimodal 64:50, 512:15, 1518:15, 9218:20\n"); puts(copyright); die(); } @@ -267,9 +267,9 @@ static void __noreturn example(void) static void __noreturn version(void) { - printf("\ntrafgen %s, Git id: %s\n", VERSION_LONG, GITVERSION); + printf("trafgen %s, Git id: %s\n", VERSION_LONG, GITVERSION); puts("multithreaded zero-copy network packet generator\n" - "http://www.netsniff-ng.org\n\n"); + "http://www.netsniff-ng.org\n"); puts(copyright); die(); } -- cgit v1.2.3-54-g00ecf