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

diff --git a/src/auth/setkey.c b/src/auth/setkey.c
index 07d2f16..fe05205 100644 (file)
--- a/src/auth/setkey.c
+++ b/src/auth/setkey.c
@@ -20,11 +20,11 @@ RCSID("$Header$");
 #include <WINNT/afsreg.h>
 #include <WINNT/afsevent.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_NETINET_IN_H

diff --git a/src/des/cksum.c b/src/des/cksum.c
index 65734f5..8d42fb3 100644 (file)
--- a/src/des/cksum.c
+++ b/src/des/cksum.c
@@ -24,11 +24,12 @@ RCSID("$Header$");
 
 #include <mit-cpyright.h>
 #include <stdio.h>
-#if defined(HAVE_STRINGS_H)
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if defined(HAVE_STRING_H)
-#include <string.h>
 #endif
 
 #include <des.h>

diff --git a/src/des/crypt.c b/src/des/crypt.c
index bd6e9f9..ccc816d 100644 (file)
--- a/src/des/crypt.c
+++ b/src/des/crypt.c
@@ -43,11 +43,12 @@ RCSID("$Header$");
 #include <windows.h>
 #endif
 #include <stdlib.h>
-#if defined(HAVE_STRINGS_H)
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if defined(HAVE_STRING_H)
-#include <string.h>
 #endif
 
 /*

diff --git a/src/des/new_rnd_key.c b/src/des/new_rnd_key.c
index b87223e..304cf9c 100644 (file)
--- 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 <pthread.h>
 #endif
-#if defined(HAVE_STRINGS_H)
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if defined(HAVE_STRING_H)
-#include <string.h>
 #endif
 #include "stats.h"
 

diff --git a/src/des/read_pssword.c b/src/des/read_pssword.c
index eebdc3f..b10972f 100644 (file)
--- a/src/des/read_pssword.c
+++ b/src/des/read_pssword.c
@@ -21,11 +21,12 @@ RCSID("$Header$");
 #include "conf.h"
 
 #include <stdio.h>
-#if defined(HAVE_STRINGS_H)
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if defined(HAVE_STRING_H)
-#include <string.h>
 #endif
 
 #ifdef BSDUNIX

diff --git a/src/des/strng_to_key.c b/src/des/strng_to_key.c
index 176f1e6..70d2651 100644 (file)
--- a/src/des/strng_to_key.c
+++ b/src/des/strng_to_key.c
@@ -29,11 +29,12 @@ RCSID("$Header$");
 
 #include <des.h>
 #include "des_internal.h"
-#if defined(HAVE_STRINGS_H)
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if defined(HAVE_STRING_H)
-#include <string.h>
 #endif
 
 extern int des_debug;

diff --git a/src/des/weak_key.c b/src/des/weak_key.c
index bd7afca..a00bbd4 100644 (file)
--- a/src/des/weak_key.c
+++ b/src/des/weak_key.c
@@ -19,11 +19,12 @@ RCSID("$Header$");
 
 #include <des.h>
 #include "des_internal.h"
-#if defined(HAVE_STRINGS_H)
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if defined(HAVE_STRING_H)
-#include <string.h>
 #endif
 
 /*

diff --git a/src/kauth/knfs.c b/src/kauth/knfs.c
index 79eaeec..dff7d57 100644 (file)
--- a/src/kauth/knfs.c
+++ b/src/kauth/knfs.c
@@ -26,6 +26,13 @@ RCSID("$Header$");
 #include <netdb.h>
 #include <errno.h>
 #include <sys/ioctl.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
 #include <afs/vice.h>
 #include <afs/cmd.h>
 #include <afs/auth.h>

diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c
index 58d8c74..9a17725 100644 (file)
--- a/src/libadmin/vos/afs_vosAdmin.c
+++ b/src/libadmin/vos/afs_vosAdmin.c
@@ -14,11 +14,11 @@ RCSID("$Header$");
 
 #include <afs/stds.h>
 #include <stdio.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include <ctype.h>

diff --git a/src/libadmin/vos/lockprocs.c b/src/libadmin/vos/lockprocs.c
index 0e27b51..16a01a5 100644 (file)
--- 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 <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 

diff --git a/src/libadmin/vos/vosutils.c b/src/libadmin/vos/vosutils.c
index 4be8c83..1ee1a2a 100644 (file)
--- 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 <afs/afs_AdminErrors.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 

diff --git a/src/libadmin/vos/vsprocs.c b/src/libadmin/vos/vsprocs.c
index e41b9c8..d7e8612 100644 (file)
--- a/src/libadmin/vos/vsprocs.c
+++ b/src/libadmin/vos/vsprocs.c
@@ -29,11 +29,11 @@ RCSID("$Header$");
 #include "../adminutil/afs_AdminInternal.h"
 #include <afs/afs_AdminErrors.h>
 #include "afs_vosAdmin.h"
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H

diff --git a/src/lwp/threadname.c b/src/lwp/threadname.c
index f5d654c..a003694 100644 (file)
--- a/src/lwp/threadname.c
+++ b/src/lwp/threadname.c
@@ -24,11 +24,11 @@
 
 RCSID("$Header$");
 
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #if defined(AFS_PTHREAD_ENV)

diff --git a/src/rx/rx.c b/src/rx/rx.c
index c6f4128..57c548b 100644 (file)
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -88,11 +88,11 @@ extern afs_int32 afs_termState;
 # include <netinet/in.h>
 # include <sys/time.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 # include "rx.h"

diff --git a/src/rx/rx_misc.c b/src/rx/rx_misc.c
index e281cb5..196a458 100644 (file)
--- 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 <stdlib.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H

diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index ce17d1e..371b6f5 100644 (file)
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -77,11 +77,11 @@ RCSID("$Header$");
 #include "rx_globals.h"
 #include <lwp.h>
 #include "rx_internal.h"
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H

diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c
index 53d4f9e..7464826 100644 (file)
--- a/src/rx/rx_rdwr.c
+++ b/src/rx/rx_rdwr.c
@@ -72,11 +72,11 @@ RCSID("$Header$");
 # include <sys/stat.h>
 # include <sys/time.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H

diff --git a/src/rx/rx_trace.c b/src/rx/rx_trace.c
index e3801fe..3fd94f0 100644 (file)
--- 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 <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef AFS_NT40_ENV

diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c
index a276e7f..f39d0e2 100644 (file)
--- a/src/rx/rx_user.c
+++ b/src/rx/rx_user.c
@@ -35,11 +35,11 @@ RCSID("$Header$");
 #endif
 #include <afs/afs_args.h>
 #include <afs/afsutil.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 

diff --git a/src/rx/rxdebug.c b/src/rx/rxdebug.c
index cf8b161..7e525ae 100644 (file)
--- a/src/rx/rxdebug.c
+++ b/src/rx/rxdebug.c
@@ -30,11 +30,11 @@ RCSID("$Header$");
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <string.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include <sys/stat.h>

diff --git a/src/rxgen/rpc_cout.c b/src/rxgen/rpc_cout.c
index 9b0688b..1742e54 100644 (file)
--- a/src/rxgen/rpc_cout.c
+++ b/src/rxgen/rpc_cout.c
@@ -39,11 +39,11 @@ RCSID("$Header$");
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include "rpc_util.h"

diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c
index 0f2f577..9885061 100644 (file)
--- a/src/rxgen/rpc_main.c
+++ b/src/rxgen/rpc_main.c
@@ -42,11 +42,11 @@ RCSID("$Header$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_SIGNAL_H

diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c
index 20f2fd4..c086323 100644 (file)
--- a/src/rxgen/rpc_parse.c
+++ b/src/rxgen/rpc_parse.c
@@ -40,11 +40,11 @@ RCSID("$Header$");
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include "rpc_util.h"

diff --git a/src/rxgen/rpc_scan.c b/src/rxgen/rpc_scan.c
index 6dc769e..1e1713f 100644 (file)
--- a/src/rxgen/rpc_scan.c
+++ b/src/rxgen/rpc_scan.c
@@ -40,11 +40,11 @@ RCSID("$Header$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include "rpc_scan.h"

diff --git a/src/rxgen/rpc_svcout.c b/src/rxgen/rpc_svcout.c
index e92d59f..71c3a87 100644 (file)
--- a/src/rxgen/rpc_svcout.c
+++ b/src/rxgen/rpc_svcout.c
@@ -38,11 +38,11 @@
 RCSID("$Header$");
 
 #include <stdio.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include "rpc_parse.h"

diff --git a/src/rxgen/rpc_util.c b/src/rxgen/rpc_util.c
index 453d178..579b514 100644 (file)
--- a/src/rxgen/rpc_util.c
+++ b/src/rxgen/rpc_util.c
@@ -38,11 +38,11 @@
 RCSID("$Header$");
 
 #include <stdio.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include "rpc_scan.h"

diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c
index 4514eb4..4fd0e20 100644 (file)
--- a/src/ubik/recovery.c
+++ b/src/ubik/recovery.c
@@ -26,6 +26,7 @@ RCSID("$Header$");
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <errno.h>
+#include <afs/afsutil.h>
 
 #define UBIK_INTERNALS
 #include "ubik.h"

diff --git a/src/ubik/udebug.c b/src/ubik/udebug.c
index 091fee5..2e27e41 100644 (file)
--- a/src/ubik/udebug.c
+++ b/src/ubik/udebug.c
@@ -14,11 +14,11 @@ RCSID("$Header$");
 
 #include <sys/types.h>
 #include <stdlib.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef AFS_NT40_ENV

diff --git a/src/update/client.c b/src/update/client.c
index ccbaadf..978b0fc 100644 (file)
--- a/src/update/client.c
+++ b/src/update/client.c
@@ -35,11 +35,11 @@ RCSID("$Header$");
 #include <sys/time.h>
 #include <dirent.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H

diff --git a/src/update/server.c b/src/update/server.c
index 7d4afea..8f22b9e 100644 (file)
--- a/src/update/server.c
+++ b/src/update/server.c
@@ -30,11 +30,11 @@ RCSID("$Header$");
 #include <sys/file.h>
 #include <dirent.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H

diff --git a/src/update/utils.c b/src/update/utils.c
index 8431430..3b05b51 100644 (file)
--- a/src/update/utils.c
+++ b/src/update/utils.c
@@ -21,11 +21,11 @@ RCSID("$Header$");
 #include <WINNT/afssw.h>
 #endif
 #include <stdio.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H

diff --git a/src/util/hostparse.c b/src/util/hostparse.c
index ccd6278..ef77c5f 100644 (file)
--- a/src/util/hostparse.c
+++ b/src/util/hostparse.c
@@ -33,11 +33,11 @@ RCSID("$Header$");
 #include <netdb.h>
 #include <ctype.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include <errno.h>

diff --git a/src/util/netutils.c b/src/util/netutils.c
index 0d5ba37..e4c85cb 100644 (file)
--- a/src/util/netutils.c
+++ b/src/util/netutils.c
@@ -23,11 +23,11 @@ RCSID("$Header$");
 
 #include <stdlib.h>
 #include <stdio.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include <ctype.h>

diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index e9e5611..9bad59b 100644 (file)
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -36,11 +36,11 @@ RCSID("$Header$");
 #include <afs/procmgmt.h>  /* signal(), kill(), wait(), etc. */
 #include <fcntl.h>
 #include <afs/stds.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include "afsutil.h"

diff --git a/src/util/volparse.c b/src/util/volparse.c
index 17e92f6..09edb2a 100644 (file)
--- a/src/util/volparse.c
+++ b/src/util/volparse.c
@@ -12,11 +12,11 @@
 
 RCSID("$Header$");
 
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_STDLIB_H