From 77d10b6d69fae4343d0c96ded4350eb4d0f0d7fd Mon Sep 17 00:00:00 2001 From: Chas Williams Date: Tue, 7 Aug 2001 00:50:05 +0000 Subject: [PATCH] invert-sense-of-strings-string-header-inclusion-20010806 this will be obsolete in current form once b* and *index are dead but apply for now --- src/auth/setkey.c | 6 +++--- src/des/cksum.c | 7 ++++--- src/des/crypt.c | 7 ++++--- src/des/new_rnd_key.c | 7 ++++--- src/des/read_pssword.c | 7 ++++--- src/des/strng_to_key.c | 7 ++++--- src/des/weak_key.c | 7 ++++--- src/kauth/knfs.c | 7 +++++++ src/libadmin/vos/afs_vosAdmin.c | 6 +++--- src/libadmin/vos/lockprocs.c | 6 +++--- src/libadmin/vos/vosutils.c | 6 +++--- src/libadmin/vos/vsprocs.c | 6 +++--- src/lwp/threadname.c | 6 +++--- src/rx/rx.c | 6 +++--- src/rx/rx_misc.c | 6 +++--- src/rx/rx_packet.c | 6 +++--- src/rx/rx_rdwr.c | 6 +++--- src/rx/rx_trace.c | 6 +++--- src/rx/rx_user.c | 6 +++--- src/rx/rxdebug.c | 6 +++--- src/rxgen/rpc_cout.c | 6 +++--- src/rxgen/rpc_main.c | 6 +++--- src/rxgen/rpc_parse.c | 6 +++--- src/rxgen/rpc_scan.c | 6 +++--- src/rxgen/rpc_svcout.c | 6 +++--- src/rxgen/rpc_util.c | 6 +++--- src/ubik/recovery.c | 1 + src/ubik/udebug.c | 6 +++--- src/update/client.c | 6 +++--- src/update/server.c | 6 +++--- src/update/utils.c | 6 +++--- src/util/hostparse.c | 6 +++--- src/util/netutils.c | 6 +++--- src/util/serverLog.c | 6 +++--- src/util/volparse.c | 6 +++--- 35 files changed, 113 insertions(+), 99 deletions(-) diff --git a/src/auth/setkey.c b/src/auth/setkey.c index 07d2f1669..fe05205a6 100644 --- a/src/auth/setkey.c +++ b/src/auth/setkey.c @@ -20,11 +20,11 @@ RCSID("$Header$"); #include #include #endif -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #ifdef HAVE_NETINET_IN_H diff --git a/src/des/cksum.c b/src/des/cksum.c index 65734f55e..8d42fb30f 100644 --- a/src/des/cksum.c +++ b/src/des/cksum.c @@ -24,11 +24,12 @@ RCSID("$Header$"); #include #include -#if defined(HAVE_STRINGS_H) +#ifdef HAVE_STRING_H +#include +#else +#ifdef HAVE_STRINGS_H #include #endif -#if defined(HAVE_STRING_H) -#include #endif #include diff --git a/src/des/crypt.c b/src/des/crypt.c index bd6e9f9a2..ccc816d90 100644 --- a/src/des/crypt.c +++ b/src/des/crypt.c @@ -43,11 +43,12 @@ RCSID("$Header$"); #include #endif #include -#if defined(HAVE_STRINGS_H) +#ifdef HAVE_STRING_H +#include +#else +#ifdef HAVE_STRINGS_H #include #endif -#if defined(HAVE_STRING_H) -#include #endif /* diff --git a/src/des/new_rnd_key.c b/src/des/new_rnd_key.c index b87223eaf..304cf9c67 100644 --- a/src/des/new_rnd_key.c +++ b/src/des/new_rnd_key.c @@ -25,11 +25,12 @@ RCSID("$Header$"); #ifdef AFS_PTHREAD_ENV #include #endif -#if defined(HAVE_STRINGS_H) +#ifdef HAVE_STRING_H +#include +#else +#ifdef HAVE_STRINGS_H #include #endif -#if defined(HAVE_STRING_H) -#include #endif #include "stats.h" diff --git a/src/des/read_pssword.c b/src/des/read_pssword.c index eebdc3fd4..b10972f11 100644 --- a/src/des/read_pssword.c +++ b/src/des/read_pssword.c @@ -21,11 +21,12 @@ RCSID("$Header$"); #include "conf.h" #include -#if defined(HAVE_STRINGS_H) +#ifdef HAVE_STRING_H +#include +#else +#ifdef HAVE_STRINGS_H #include #endif -#if defined(HAVE_STRING_H) -#include #endif #ifdef BSDUNIX diff --git a/src/des/strng_to_key.c b/src/des/strng_to_key.c index 176f1e681..70d265181 100644 --- a/src/des/strng_to_key.c +++ b/src/des/strng_to_key.c @@ -29,11 +29,12 @@ RCSID("$Header$"); #include #include "des_internal.h" -#if defined(HAVE_STRINGS_H) +#ifdef HAVE_STRING_H +#include +#else +#ifdef HAVE_STRINGS_H #include #endif -#if defined(HAVE_STRING_H) -#include #endif extern int des_debug; diff --git a/src/des/weak_key.c b/src/des/weak_key.c index bd7afca51..a00bbd49f 100644 --- a/src/des/weak_key.c +++ b/src/des/weak_key.c @@ -19,11 +19,12 @@ RCSID("$Header$"); #include #include "des_internal.h" -#if defined(HAVE_STRINGS_H) +#ifdef HAVE_STRING_H +#include +#else +#ifdef HAVE_STRINGS_H #include #endif -#if defined(HAVE_STRING_H) -#include #endif /* diff --git a/src/kauth/knfs.c b/src/kauth/knfs.c index 79eaeecdb..dff7d57dd 100644 --- a/src/kauth/knfs.c +++ b/src/kauth/knfs.c @@ -26,6 +26,13 @@ RCSID("$Header$"); #include #include #include +#ifdef HAVE_STRING_H +#include +#else +#ifdef HAVE_STRINGS_H +#include +#endif +#endif #include #include #include diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c index 58d8c74a3..9a17725b5 100644 --- a/src/libadmin/vos/afs_vosAdmin.c +++ b/src/libadmin/vos/afs_vosAdmin.c @@ -14,11 +14,11 @@ RCSID("$Header$"); #include #include -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #include diff --git a/src/libadmin/vos/lockprocs.c b/src/libadmin/vos/lockprocs.c index 0e27b51b6..16a01a536 100644 --- a/src/libadmin/vos/lockprocs.c +++ b/src/libadmin/vos/lockprocs.c @@ -13,11 +13,11 @@ RCSID("$Header$"); #include "lockprocs.h" -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif diff --git a/src/libadmin/vos/vosutils.c b/src/libadmin/vos/vosutils.c index 4be8c83b9..1ee1a2a31 100644 --- a/src/libadmin/vos/vosutils.c +++ b/src/libadmin/vos/vosutils.c @@ -16,11 +16,11 @@ RCSID("$Header$"); #include "vsprocs.h" #include "lockprocs.h" #include -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif diff --git a/src/libadmin/vos/vsprocs.c b/src/libadmin/vos/vsprocs.c index e41b9c8c4..d7e86129a 100644 --- a/src/libadmin/vos/vsprocs.c +++ b/src/libadmin/vos/vsprocs.c @@ -29,11 +29,11 @@ RCSID("$Header$"); #include "../adminutil/afs_AdminInternal.h" #include #include "afs_vosAdmin.h" -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #ifdef HAVE_UNISTD_H diff --git a/src/lwp/threadname.c b/src/lwp/threadname.c index f5d654c66..a003694a3 100644 --- a/src/lwp/threadname.c +++ b/src/lwp/threadname.c @@ -24,11 +24,11 @@ RCSID("$Header$"); -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #if defined(AFS_PTHREAD_ENV) diff --git a/src/rx/rx.c b/src/rx/rx.c index c6f41284b..57c548b2e 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -88,11 +88,11 @@ extern afs_int32 afs_termState; # include # include #endif -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif # include "rx.h" diff --git a/src/rx/rx_misc.c b/src/rx/rx_misc.c index e281cb523..196a458c1 100644 --- a/src/rx/rx_misc.c +++ b/src/rx/rx_misc.c @@ -29,11 +29,11 @@ RCSID("$Header$"); #include "rx.h" #endif /* AFS_PTHREAD_ENV */ #include -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #ifdef HAVE_UNISTD_H diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c index ce17d1ee4..371b6f517 100644 --- a/src/rx/rx_packet.c +++ b/src/rx/rx_packet.c @@ -77,11 +77,11 @@ RCSID("$Header$"); #include "rx_globals.h" #include #include "rx_internal.h" -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #ifdef HAVE_UNISTD_H diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c index 53d4f9ee4..7464826f3 100644 --- a/src/rx/rx_rdwr.c +++ b/src/rx/rx_rdwr.c @@ -72,11 +72,11 @@ RCSID("$Header$"); # include # include #endif -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #ifdef HAVE_UNISTD_H diff --git a/src/rx/rx_trace.c b/src/rx/rx_trace.c index e3801fe52..3fd94f0ed 100644 --- a/src/rx/rx_trace.c +++ b/src/rx/rx_trace.c @@ -13,11 +13,11 @@ RCSID("$Header$"); #ifdef RXDEBUG -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #ifdef AFS_NT40_ENV diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c index a276e7f27..f39d0e2b0 100644 --- a/src/rx/rx_user.c +++ b/src/rx/rx_user.c @@ -35,11 +35,11 @@ RCSID("$Header$"); #endif #include #include -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif diff --git a/src/rx/rxdebug.c b/src/rx/rxdebug.c index cf8b161b6..7e525ae21 100644 --- a/src/rx/rxdebug.c +++ b/src/rx/rxdebug.c @@ -30,11 +30,11 @@ RCSID("$Header$"); #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #include diff --git a/src/rxgen/rpc_cout.c b/src/rxgen/rpc_cout.c index 9b0688be4..1742e5460 100644 --- a/src/rxgen/rpc_cout.c +++ b/src/rxgen/rpc_cout.c @@ -39,11 +39,11 @@ RCSID("$Header$"); #include #include -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #include "rpc_util.h" diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c index 0f2f577c8..98850613d 100644 --- a/src/rxgen/rpc_main.c +++ b/src/rxgen/rpc_main.c @@ -42,11 +42,11 @@ RCSID("$Header$"); #include #include #include -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #ifdef HAVE_SIGNAL_H diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c index 20f2fd454..c08632390 100644 --- a/src/rxgen/rpc_parse.c +++ b/src/rxgen/rpc_parse.c @@ -40,11 +40,11 @@ RCSID("$Header$"); #include #include #include -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #include "rpc_util.h" diff --git a/src/rxgen/rpc_scan.c b/src/rxgen/rpc_scan.c index 6dc769e50..1e1713fda 100644 --- a/src/rxgen/rpc_scan.c +++ b/src/rxgen/rpc_scan.c @@ -40,11 +40,11 @@ RCSID("$Header$"); #include #include #include -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #include "rpc_scan.h" diff --git a/src/rxgen/rpc_svcout.c b/src/rxgen/rpc_svcout.c index e92d59fcb..71c3a875d 100644 --- a/src/rxgen/rpc_svcout.c +++ b/src/rxgen/rpc_svcout.c @@ -38,11 +38,11 @@ RCSID("$Header$"); #include -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #include "rpc_parse.h" diff --git a/src/rxgen/rpc_util.c b/src/rxgen/rpc_util.c index 453d1785f..579b51462 100644 --- a/src/rxgen/rpc_util.c +++ b/src/rxgen/rpc_util.c @@ -38,11 +38,11 @@ RCSID("$Header$"); #include -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #include "rpc_scan.h" diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c index 4514eb4b4..4fd0e20ab 100644 --- a/src/ubik/recovery.c +++ b/src/ubik/recovery.c @@ -26,6 +26,7 @@ RCSID("$Header$"); #include #include #include +#include #define UBIK_INTERNALS #include "ubik.h" diff --git a/src/ubik/udebug.c b/src/ubik/udebug.c index 091fee572..2e27e4104 100644 --- a/src/ubik/udebug.c +++ b/src/ubik/udebug.c @@ -14,11 +14,11 @@ RCSID("$Header$"); #include #include -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #ifdef AFS_NT40_ENV diff --git a/src/update/client.c b/src/update/client.c index ccbaadfa0..978b0fc04 100644 --- a/src/update/client.c +++ b/src/update/client.c @@ -35,11 +35,11 @@ RCSID("$Header$"); #include #include #endif -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #ifdef HAVE_UNISTD_H diff --git a/src/update/server.c b/src/update/server.c index 7d4afea3a..8f22b9ebb 100644 --- a/src/update/server.c +++ b/src/update/server.c @@ -30,11 +30,11 @@ RCSID("$Header$"); #include #include #endif -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #ifdef HAVE_UNISTD_H diff --git a/src/update/utils.c b/src/update/utils.c index 84314307b..3b05b51c8 100644 --- a/src/update/utils.c +++ b/src/update/utils.c @@ -21,11 +21,11 @@ RCSID("$Header$"); #include #endif #include -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #ifdef HAVE_UNISTD_H diff --git a/src/util/hostparse.c b/src/util/hostparse.c index ccd627874..ef77c5f90 100644 --- a/src/util/hostparse.c +++ b/src/util/hostparse.c @@ -33,11 +33,11 @@ RCSID("$Header$"); #include #include #endif -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #include diff --git a/src/util/netutils.c b/src/util/netutils.c index 0d5ba3712..e4c85cb24 100644 --- a/src/util/netutils.c +++ b/src/util/netutils.c @@ -23,11 +23,11 @@ RCSID("$Header$"); #include #include -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #include diff --git a/src/util/serverLog.c b/src/util/serverLog.c index e9e561170..9bad59b37 100644 --- a/src/util/serverLog.c +++ b/src/util/serverLog.c @@ -36,11 +36,11 @@ RCSID("$Header$"); #include /* signal(), kill(), wait(), etc. */ #include #include -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #include "afsutil.h" diff --git a/src/util/volparse.c b/src/util/volparse.c index 17e92f650..09edb2a0a 100644 --- a/src/util/volparse.c +++ b/src/util/volparse.c @@ -12,11 +12,11 @@ RCSID("$Header$"); -#ifdef HAVE_STRINGS_H -#include -#else #ifdef HAVE_STRING_H #include +#else +#ifdef HAVE_STRINGS_H +#include #endif #endif #ifdef HAVE_STDLIB_H -- 2.39.5