From e1261c96209def183f58bc4cb061ef207719cd65 Mon Sep 17 00:00:00 2001 From: Sylvain Rochet Date: Sat, 2 Jun 2012 23:29:40 +0200 Subject: [PATCH] removed all system headers except the strict minimum --- src/netif/ppp/auth.c | 8 +++----- src/netif/ppp/chap-md5.c | 2 ++ src/netif/ppp/chap-new.c | 2 ++ src/netif/ppp/chap_ms.c | 2 ++ src/netif/ppp/fsm.c | 2 ++ src/netif/ppp/ipcp.c | 6 ++---- src/netif/ppp/lcp.c | 2 ++ src/netif/ppp/ppp.h | 22 ++++++++++++---------- src/netif/ppp/ppp_oe.c | 12 ++++++------ src/netif/ppp/upap.c | 2 ++ src/netif/ppp/utils.c | 14 ++++++++------ 11 files changed, 43 insertions(+), 31 deletions(-) diff --git a/src/netif/ppp/auth.c b/src/netif/ppp/auth.c index abf9d75f..9b17144b 100644 --- a/src/netif/ppp/auth.c +++ b/src/netif/ppp/auth.c @@ -70,6 +70,7 @@ #include "lwip/opt.h" +#if 0 /* UNUSED */ #include #include #include @@ -80,21 +81,16 @@ #include #include #include -#if 0 #include #include -#endif #include #if defined(_PATH_LASTLOG) && defined(__linux__) #include #endif -#if 0 #include #include #include -#endif - #ifdef HAS_SHADOW #include @@ -102,7 +98,9 @@ #define PW_PPP PW_LOGIN #endif #endif + #include +#endif /* UNUSED */ #include "ppp.h" diff --git a/src/netif/ppp/chap-md5.c b/src/netif/ppp/chap-md5.c index e7ed182a..3f6734e1 100644 --- a/src/netif/ppp/chap-md5.c +++ b/src/netif/ppp/chap-md5.c @@ -31,8 +31,10 @@ #include "lwip/opt.h" #if PPP_SUPPORT && CHAP_SUPPORT /* don't build if not configured for use in lwipopts.h */ +#if 0 /* UNUSED */ #include #include +#endif /* UNUSED */ #include "ppp.h" diff --git a/src/netif/ppp/chap-new.c b/src/netif/ppp/chap-new.c index 3319f0f5..8f0a7d6f 100644 --- a/src/netif/ppp/chap-new.c +++ b/src/netif/ppp/chap-new.c @@ -33,8 +33,10 @@ #define RCSID "$Id: chap-new.c,v 1.9 2007/06/19 02:08:35 carlsonj Exp $" +#if 0 /* UNUSED */ #include #include +#endif /* UNUSED */ #include "ppp.h" diff --git a/src/netif/ppp/chap_ms.c b/src/netif/ppp/chap_ms.c index fa838d06..e70c28fc 100644 --- a/src/netif/ppp/chap_ms.c +++ b/src/netif/ppp/chap_ms.c @@ -77,6 +77,7 @@ #include "lwip/opt.h" #if PPP_SUPPORT && MSCHAP_SUPPORT /* don't build if not configured for use in lwipopts.h */ +#if 0 /* UNUSED */ #include #include #include @@ -84,6 +85,7 @@ #include #include #include +#endif /* UNUSED */ #include "ppp.h" diff --git a/src/netif/ppp/fsm.c b/src/netif/ppp/fsm.c index f3c834e2..cb0a8829 100644 --- a/src/netif/ppp/fsm.c +++ b/src/netif/ppp/fsm.c @@ -50,9 +50,11 @@ * Deal with variable outgoing MTU. */ +#if 0 /* UNUSED */ #include #include #include +#endif /* UNUSED */ #include "ppp.h" diff --git a/src/netif/ppp/ipcp.c b/src/netif/ppp/ipcp.c index 0c53f887..f0ebea2e 100644 --- a/src/netif/ppp/ipcp.c +++ b/src/netif/ppp/ipcp.c @@ -48,19 +48,17 @@ * TODO: */ +#if 0 /* UNUSED */ #include #include #include -#if 0 #include -#endif #include #include -#if 0 #include #include #include -#endif +#endif /* UNUSED */ #include "ppp.h" diff --git a/src/netif/ppp/lcp.c b/src/netif/ppp/lcp.c index bf85bb8c..b0aee641 100644 --- a/src/netif/ppp/lcp.c +++ b/src/netif/ppp/lcp.c @@ -46,9 +46,11 @@ * TODO: */ +#if 0 /* UNUSED */ #include #include #include +#endif /* UNUSED */ #include "ppp.h" diff --git a/src/netif/ppp/ppp.h b/src/netif/ppp/ppp.h index 331db515..abdbcc1c 100644 --- a/src/netif/ppp/ppp.h +++ b/src/netif/ppp/ppp.h @@ -10,16 +10,7 @@ #ifndef PPPMY_H_ #define PPPMY_H_ -#include "lwip/netif.h" -#include "lwip/def.h" -#include "lwip/timers.h" - -#include "pppdebug.h" -#include "net/ppp_defs.h" /* FIXME: merge linux/ppp_defs.h content here */ - -#ifdef INET6 -#include "eui64.h" -#endif +#include /* formats */ #if defined(__STDC__) #include @@ -31,6 +22,17 @@ #define volatile #endif +#include "lwip/netif.h" +#include "lwip/def.h" +#include "lwip/timers.h" + +#include "pppdebug.h" +#include "net/ppp_defs.h" /* FIXME: merge linux/ppp_defs.h content here */ + +#ifdef INET6 +#include "eui64.h" +#endif + /* * Limits. */ diff --git a/src/netif/ppp/ppp_oe.c b/src/netif/ppp/ppp_oe.c index 64d6f2b0..2b7912bf 100644 --- a/src/netif/ppp/ppp_oe.c +++ b/src/netif/ppp/ppp_oe.c @@ -69,20 +69,20 @@ */ #include "lwip/opt.h" - #if PPPOE_SUPPORT /* don't build if not configured for use in lwipopts.h */ -#include "netif/ppp_oe.h" - -#include "ppp.h" +#if 0 /* UNUSED */ +#include +#include +#endif /* UNUSED */ #include "lwip/timers.h" #include "lwip/memp.h" #include "lwip/stats.h" -#include -#include +#include "ppp.h" +#include "netif/ppp_oe.h" /* Add a 16 bit unsigned value to a buffer pointed to by PTR */ #define PPPOE_ADD_16(PTR, VAL) \ diff --git a/src/netif/ppp/upap.c b/src/netif/ppp/upap.c index a6be5837..ed8e496b 100644 --- a/src/netif/ppp/upap.c +++ b/src/netif/ppp/upap.c @@ -47,8 +47,10 @@ * TODO: */ +#if 0 /* UNUSED */ #include #include +#endif /* UNUSED */ #include "ppp.h" diff --git a/src/netif/ppp/utils.c b/src/netif/ppp/utils.c index 6d9966af..679d0ef8 100644 --- a/src/netif/ppp/utils.c +++ b/src/netif/ppp/utils.c @@ -32,6 +32,7 @@ #define RCSID "$Id: utils.c,v 1.25 2008/06/03 12:06:37 paulus Exp $" +#if 0 /* UNUSED */ #include #include #include @@ -40,14 +41,10 @@ #include #include #include -#if 0 #include #include -#endif #include -#if 0 #include -#endif #include #include #include @@ -55,13 +52,14 @@ #include #include #include -#if 0 #include #include -#endif #ifdef SVR4 #include #endif +#endif /* UNUSED */ + +#include /* isdigit() */ #include "ppp.h" @@ -175,7 +173,9 @@ vslprintf(buf, buflen, fmt, args) char *str, *f, *buf0; unsigned char *p; char num[32]; +#if 0 /* need port */ time_t t; +#endif /* need port */ u_int32_t ip; static char hexchars[] = "0123456789abcdef"; #if PRINTPKT_SUPPORT @@ -313,12 +313,14 @@ vslprintf(buf, buflen, fmt, args) buflen -= n; continue; #endif +#if 0 /* need port */ case 't': time(&t); str = ctime(&t); str += 4; /* chop off the day name */ str[15] = 0; /* chop off year and newline */ break; +#endif /* need port */ case 'v': /* "visible" string */ case 'q': /* quoted string */ quoted = c == 'q';