From dcbc67df65def39d1b47e0792a6b5141a9e40299 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Tue, 21 Feb 2012 18:17:41 +0100 Subject: [PATCH] xsys: renamed netdev.c/h to xsys.c/h to further reduce other files --- src/ashunt.c | 2 +- src/ashunt/CMakeLists.txt | 6 +++--- src/bpfc/CMakeLists.txt | 2 +- src/ct_client.c | 2 +- src/ct_server.c | 2 +- src/curvetun.c | 2 +- src/curvetun/CMakeLists.txt | 4 ++-- src/ifpps.c | 2 +- src/ifpps/CMakeLists.txt | 4 ++-- src/netsniff-ng.c | 2 +- src/netsniff-ng/CMakeLists.txt | 4 ++-- src/ring.h | 2 +- src/trafgen.c | 2 +- src/trafgen/CMakeLists.txt | 4 ++-- src/{netdev.c => xsys.c} | 2 +- src/{netdev.h => xsys.h} | 6 +++--- 16 files changed, 24 insertions(+), 24 deletions(-) rename src/{netdev.c => xsys.c} (99%) rename src/{netdev.h => xsys.h} (97%) diff --git a/src/ashunt.c b/src/ashunt.c index 974b500d..ff3cfc15 100644 --- a/src/ashunt.c +++ b/src/ashunt.c @@ -234,7 +234,7 @@ Please report bugs to #include "xio.h" #include "aslookup.h" #include "signals.h" -#include "netdev.h" +#include "xsys.h" #include "mtrand.h" #include "parser.h" #include "ring_rx.h" diff --git a/src/ashunt/CMakeLists.txt b/src/ashunt/CMakeLists.txt index 86c47e97..9b686c73 100644 --- a/src/ashunt/CMakeLists.txt +++ b/src/ashunt/CMakeLists.txt @@ -7,13 +7,13 @@ FIND_PACKAGE(Threads) IF (LIBGEOIP_FOUND AND CMAKE_HAVE_PTHREAD_CREATE) ADD_EXECUTABLE(${PROJECT_NAME} ../xmalloc.c - ../strlcpy.c ../xio.c - ../netdev.c + ../xsys.c + ../strlcpy.c + ../tprintf.c ../aslookup.c ../bpf.c ../mtrand.c - ../tprintf.c ../parser.c ../ring_rx.c ../ashunt.c) diff --git a/src/bpfc/CMakeLists.txt b/src/bpfc/CMakeLists.txt index 5166a16e..b16b55ab 100644 --- a/src/bpfc/CMakeLists.txt +++ b/src/bpfc/CMakeLists.txt @@ -10,8 +10,8 @@ IF (FLEX_FOUND AND BISON_FOUND) BISON_TARGET(BPF_PARSER ../bpf_parser.y ${CMAKE_CURRENT_BINARY_DIR}/bpf_parser.tab.c) ADD_EXECUTABLE(${PROJECT_NAME} ../xmalloc.c - ../bpf.c ../strlcpy.c + ../bpf.c ${FLEX_BPF_LEXER_OUTPUTS} ${BISON_BPF_PARSER_OUTPUT_SOURCE} ../bpfc.c) diff --git a/src/ct_client.c b/src/ct_client.c index f53bf4c1..fd855c8e 100644 --- a/src/ct_client.c +++ b/src/ct_client.c @@ -32,7 +32,7 @@ #include "strlcpy.h" #include "curve.h" #include "mtrand.h" -#include "netdev.h" +#include "xsys.h" #include "xmalloc.h" #include "curvetun.h" #include "servmgmt.h" diff --git a/src/ct_server.c b/src/ct_server.c index e226a82f..04e37d66 100644 --- a/src/ct_server.c +++ b/src/ct_server.c @@ -30,7 +30,7 @@ #include #include "die.h" -#include "netdev.h" +#include "xsys.h" #include "xio.h" #include "psched.h" #include "xmalloc.h" diff --git a/src/curvetun.c b/src/curvetun.c index a14ea4a3..15e49a3a 100644 --- a/src/curvetun.c +++ b/src/curvetun.c @@ -47,7 +47,7 @@ #include #include -#include "netdev.h" +#include "xsys.h" #include "stun.h" #include "die.h" #include "tty.h" diff --git a/src/curvetun/CMakeLists.txt b/src/curvetun/CMakeLists.txt index 797cdd74..ed192d3b 100644 --- a/src/curvetun/CMakeLists.txt +++ b/src/curvetun/CMakeLists.txt @@ -10,10 +10,10 @@ FIND_PACKAGE(LibNaCl) IF (NACL_FOUND AND CMAKE_THREAD_LIBS_INIT) ADD_EXECUTABLE(${PROJECT_NAME} ../xmalloc.c - ../strlcpy.c ../xio.c + ../xsys.c + ../strlcpy.c ../cpusched.c - ../netdev.c ../stun.c ../mtrand.c ../usermgmt.c diff --git a/src/ifpps.c b/src/ifpps.c index 3a9d03a1..cba077a0 100644 --- a/src/ifpps.c +++ b/src/ifpps.c @@ -126,7 +126,7 @@ Please report bugs to #include "xio.h" #include "timespec.h" #include "tty.h" -#include "netdev.h" +#include "xsys.h" #include "signals.h" /* diff --git a/src/ifpps/CMakeLists.txt b/src/ifpps/CMakeLists.txt index 9ad92def..48e9bb36 100644 --- a/src/ifpps/CMakeLists.txt +++ b/src/ifpps/CMakeLists.txt @@ -6,9 +6,9 @@ FIND_PACKAGE(Curses) IF(CURSES_FOUND) ADD_EXECUTABLE(${PROJECT_NAME} ../xmalloc.c - ../strlcpy.c ../xio.c - ../netdev.c + ../xsys.c + ../strlcpy.c ../ifpps.c) ADD_DEFINITIONS(-DPROGNAME_STRING="${PROJECT_NAME}" diff --git a/src/netsniff-ng.c b/src/netsniff-ng.c index 1eb36f73..225c03bf 100644 --- a/src/netsniff-ng.c +++ b/src/netsniff-ng.c @@ -39,7 +39,7 @@ #include "ring_rx.h" #include "ring_tx.h" -#include "netdev.h" +#include "xsys.h" #include "compiler.h" #include "pcap.h" #include "poll.h" diff --git a/src/netsniff-ng/CMakeLists.txt b/src/netsniff-ng/CMakeLists.txt index 7c23312c..f3738557 100644 --- a/src/netsniff-ng/CMakeLists.txt +++ b/src/netsniff-ng/CMakeLists.txt @@ -9,6 +9,8 @@ IF (CMAKE_HAVE_PTHREAD_CREATE) ../dissector.c ../dissector_eth.c ../xmalloc.c + ../xio.c + ../xsys.c ../strlcpy.c ../bpf.c ../parser.c @@ -17,11 +19,9 @@ IF (CMAKE_HAVE_PTHREAD_CREATE) ../pcap_rw.c ../pcap_sg.c ../pcap_mmap.c - ../xio.c ../ring_rx.c ../ring_tx.c ../mtrand.c - ../netdev.c ../tprintf.c ../netsniff-ng.c) ADD_DEFINITIONS(-DPROGNAME_STRING="${PROJECT_NAME}" diff --git a/src/ring.h b/src/ring.h index fdb292e0..65678e93 100644 --- a/src/ring.h +++ b/src/ring.h @@ -17,7 +17,7 @@ #include #include -#include "netdev.h" +#include "xsys.h" #include "tprintf.h" #include "dissector.h" #include "compiler.h" diff --git a/src/trafgen.c b/src/trafgen.c index 05776359..e8e8a6f4 100644 --- a/src/trafgen.c +++ b/src/trafgen.c @@ -171,7 +171,7 @@ Please report bugs to #include "strlcpy.h" #include "parser.h" #include "die.h" -#include "netdev.h" +#include "xsys.h" #include "psched.h" #include "xio.h" #include "tty.h" diff --git a/src/trafgen/CMakeLists.txt b/src/trafgen/CMakeLists.txt index 2ff55d7d..fe0ec342 100644 --- a/src/trafgen/CMakeLists.txt +++ b/src/trafgen/CMakeLists.txt @@ -3,14 +3,14 @@ PROJECT(trafgen C) SET(BUILD_STRING "generic") ADD_EXECUTABLE(${PROJECT_NAME} ../xmalloc.c + ../xio.c + ../xsys.c ../strlcpy.c ../psched.c ../parser.c ../mtrand.c ../opt_memcpy.c - ../xio.c ../ring_tx.c - ../netdev.c ../trafgen.c) ADD_DEFINITIONS(-DPROGNAME_STRING="${PROJECT_NAME}" diff --git a/src/netdev.c b/src/xsys.c similarity index 99% rename from src/netdev.c rename to src/xsys.c index 532b6f34..59f319a5 100644 --- a/src/netdev.c +++ b/src/xsys.c @@ -26,7 +26,7 @@ #include #include "die.h" -#include "netdev.h" +#include "xsys.h" #include "strlcpy.h" int af_socket(int af) diff --git a/src/netdev.h b/src/xsys.h similarity index 97% rename from src/netdev.h rename to src/xsys.h index 130fc38e..234c68ca 100644 --- a/src/netdev.h +++ b/src/xsys.h @@ -6,8 +6,8 @@ * Subject to the GPL, version 2. */ -#ifndef NETDEV_H -#define NETDEV_H +#ifndef XSYS_H +#define XSYS_H #include #include @@ -92,4 +92,4 @@ static inline int device_up_and_running(char *ifname) (IFF_UP | IFF_RUNNING); } -#endif /* NETDEV_H */ +#endif /* XSYS_H */ -- 2.11.4.GIT