aix-strings-h-preferred-over-string-h-20010628

otherwise we get weird errors like:
"/usr/include/strings.h", line 52.20: 1506-010 (W) Macro index invoked with a null argument for parameter __s1.
"/usr/include/strings.h", line 52.20: 1506-041 (E) The invocation of macro index contains fewer arguments than required by the macro definition.
"/usr/include/strings.h", line 52.14: 1506-275 (S) Unexpected text ',' encountered.

from the conflict

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

to prevent more of same errors

====================

====================

continue to placate aix hatred

====================

aix needs more help

====================

aix needs more help

diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c
index c8558a7c29dc2a605d9b762f3eaf8c5cd41ec274..3256a951f12ea8d7695d4dab4e374606379a10e3 100644 (file)
--- a/src/libadmin/vos/afs_vosAdmin.c
+++ b/src/libadmin/vos/afs_vosAdmin.c
@@ -11,11 +11,12 @@
 #include <afsconfig.h>
 #include <afs/stds.h>
 #include <stdio.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #include <ctype.h>
 #ifdef AFS_NT40_ENV

diff --git a/src/libadmin/vos/lockprocs.c b/src/libadmin/vos/lockprocs.c
index ff00e1a943268912f1b7d18645d297fa27b18de9..1473c6ab8a3a5dd7aff5256ce21db61ec82b7b87 100644 (file)
--- a/src/libadmin/vos/lockprocs.c
+++ b/src/libadmin/vos/lockprocs.c
@@ -8,11 +8,12 @@
  */
 
 #include "lockprocs.h"
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 
 /* Finds an index in VLDB entry that matches the volume type, server, and partition.

diff --git a/src/libadmin/vos/vosutils.c b/src/libadmin/vos/vosutils.c
index ef927ef5157346bb3a538b988fbfe38f0569537a..de907518c736ec89cdf92e6c647dba57c82165fb 100644 (file)
--- a/src/libadmin/vos/vosutils.c
+++ b/src/libadmin/vos/vosutils.c
@@ -13,10 +13,11 @@
 #include <afs/afs_AdminErrors.h>
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
-#endif
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
+#endif
 
 /*
  * Functions that aren't prototyped, but that we use

diff --git a/src/libadmin/vos/vsprocs.c b/src/libadmin/vos/vsprocs.c
index 36b049d83516ec8be0f56baf30f5ac7d7908b3a5..fccdf8681b8015a05e8fde2e52f41f34767c56c6 100644 (file)
--- a/src/libadmin/vos/vsprocs.c
+++ b/src/libadmin/vos/vsprocs.c
@@ -24,11 +24,12 @@
 #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>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/lwp/threadname.c b/src/lwp/threadname.c
index e888836f7f4e01ffac7c2c6b6fb249e6ae05046e..c9df424f40986353b90e327c4a3dd7551ee6edb5 100644 (file)
--- a/src/lwp/threadname.c
+++ b/src/lwp/threadname.c
@@ -21,11 +21,12 @@
 
 #include <afs/param.h>
 #include <afsconfig.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #if defined(AFS_PTHREAD_ENV)
 #include <pthread.h>

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 5337a508e6aaa4a45935d50a1ea947ed6c7391bc..1b2fd0a2d7ed0cb2fe2a8cfc48ee879bfe6646e5 100644 (file)
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -83,11 +83,12 @@ 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>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 # include "rx.h"
 # include "rx_user.h"

diff --git a/src/rx/rx_misc.c b/src/rx/rx_misc.c
index 452715e654b930f540f10cc57273eac6517193b4..555c549bb6346fb3f4d688183d18a8a735ae3850 100644 (file)
--- a/src/rx/rx_misc.c
+++ b/src/rx/rx_misc.c
@@ -26,11 +26,12 @@
 #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>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index fa35d93dd1844eed205950e2d4f421b35fcee55a..30323847a6ed791495aa7f9a8f50b79dae0ddd15 100644 (file)
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -72,11 +72,12 @@
 #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>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c
index 358c396a848036e37502458c916cb3459faceabd..e3d68e4e8c4b349344ba835cd994d6ac6a8810a9 100644 (file)
--- a/src/rx/rx_rdwr.c
+++ b/src/rx/rx_rdwr.c
@@ -67,11 +67,12 @@
 # include <sys/stat.h>
 # include <sys/time.h>
 #endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/rx/rx_trace.c b/src/rx/rx_trace.c
index 40f43d49b5dc2996b66c0eec10a26d340fb590f2..888bb50989d5055c913aa1d73bb8e1a14047bd39 100644 (file)
--- a/src/rx/rx_trace.c
+++ b/src/rx/rx_trace.c
@@ -11,11 +11,12 @@
 
 #include <afs/param.h>
 #include <afsconfig.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>

diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c
index 5820e9ad8e8eff90cd0f7a4ea5e020c598aec429..490568d8ecaf9eed9cccd12b3bc31edbe0fd5e01 100644 (file)
--- a/src/rx/rx_user.c
+++ b/src/rx/rx_user.c
@@ -34,10 +34,11 @@
 #include <afs/afsutil.h>
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
-#endif
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
+#endif
 
 #ifndef        IPPORT_USERRESERVED
 /* If in.h doesn't define this, define it anyway.  Unfortunately, defining

diff --git a/src/rx/rxdebug.c b/src/rx/rxdebug.c
index 627912b2cc5185ea1d8dddecd611bc0361a759e7..6db38b7253606b861fa080227328d97da9954994 100644 (file)
--- a/src/rx/rxdebug.c
+++ b/src/rx/rxdebug.c
@@ -27,11 +27,12 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_STRINGS_H
+#include <string.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <string.h>
 #endif
 #include <sys/stat.h>
 #include <afs/stds.h>

diff --git a/src/rxgen/rpc_cout.c b/src/rxgen/rpc_cout.c
index e529e8b449dce5af27f58a1de7b36016f89c1932..8bdcf6208877b59c29f617445dea813368fc161b 100644 (file)
--- a/src/rxgen/rpc_cout.c
+++ b/src/rxgen/rpc_cout.c
@@ -36,11 +36,12 @@
 #include <afsconfig.h>
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #include "rpc_util.h"
 #include "rpc_parse.h"

diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c
index 01ad71b1ca4fe5c9822d5a76c5a25b4563f641d8..b1b3620afe0f6a679dd957493d43fdddf189738a 100644 (file)
--- a/src/rxgen/rpc_main.c
+++ b/src/rxgen/rpc_main.c
@@ -39,11 +39,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>

diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c
index e3654eaa0c86184768660ad4dbdbcc817d630480..8ae4bdca5b782d4c90d3fcc3d30b4f68f42962b7 100644 (file)
--- a/src/rxgen/rpc_parse.c
+++ b/src/rxgen/rpc_parse.c
@@ -37,12 +37,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #include "rpc_util.h"
 #include "rpc_scan.h"

diff --git a/src/rxgen/rpc_scan.c b/src/rxgen/rpc_scan.c
index d2d390d0d5358d3fb8f91948a7e8502e8b552042..979079aa6233910d03ec24272a9215861476b0a2 100644 (file)
--- a/src/rxgen/rpc_scan.c
+++ b/src/rxgen/rpc_scan.c
@@ -37,11 +37,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #include "rpc_scan.h"
 #include "rpc_util.h"

diff --git a/src/rxgen/rpc_svcout.c b/src/rxgen/rpc_svcout.c
index 5724ba8136375048966ef00ad5864ddb7a62cf9c..ef0794597daaed4bdfce1b3e7512f82361e31612 100644 (file)
--- a/src/rxgen/rpc_svcout.c
+++ b/src/rxgen/rpc_svcout.c
@@ -35,11 +35,12 @@
 #include <afs/param.h>
 #include <afsconfig.h>
 #include <stdio.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #include "rpc_parse.h"
 #include "rpc_util.h"

diff --git a/src/rxgen/rpc_util.c b/src/rxgen/rpc_util.c
index 4b7ce3a36dc094c121fa2ad9dc959b9033835ee4..807ccbdfeef7345257b4b9ab3289f0181024b1de 100644 (file)
--- a/src/rxgen/rpc_util.c
+++ b/src/rxgen/rpc_util.c
@@ -35,11 +35,12 @@
 #include <afs/param.h>
 #include <afsconfig.h>
 #include <stdio.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #include "rpc_scan.h"
 #include "rpc_parse.h"

diff --git a/src/ubik/udebug.c b/src/ubik/udebug.c
index 4d53ed5a3a621f31aeabb53326325386e605abce..b33a36289a93768371c9b22e94afcdb3b2c15c17 100644 (file)
--- a/src/ubik/udebug.c
+++ b/src/ubik/udebug.c
@@ -11,11 +11,12 @@
 #include <afsconfig.h>
 #include <sys/types.h>
 #include <stdlib.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>

diff --git a/src/update/client.c b/src/update/client.c
index a90f9566fa78e4d8eeaf4c41b4d9d4ed026e2ae5..b38fc654e8d5ba59832dc5aa21eabc65b97464d2 100644 (file)
--- a/src/update/client.c
+++ b/src/update/client.c
@@ -34,10 +34,11 @@
 #endif
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
-#endif
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/update/server.c b/src/update/server.c
index bf584a7fe8a9b00b6b0b5f95b4d00a92344beb84..471c4a94ec39109f85b54919cb89a39f744c3261 100644 (file)
--- a/src/update/server.c
+++ b/src/update/server.c
@@ -27,11 +27,12 @@
 #include <sys/file.h>
 #include <dirent.h>
 #endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/update/utils.c b/src/update/utils.c
index 5573eddf8bb2107a888b9e7ec5d558d53cb63b87..5f7de410ad01841d2584a248e8cd7e5d28629627 100644 (file)
--- a/src/update/utils.c
+++ b/src/update/utils.c
@@ -18,11 +18,12 @@
 #include <WINNT/afssw.h>
 #endif
 #include <stdio.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/util/volparse.c b/src/util/volparse.c
index 441d88ba2e174acf7a333b2a1d18d157235d9af1..bad8961bb44a4c936badd6054f5c6657a1334be1 100644 (file)
--- a/src/util/volparse.c
+++ b/src/util/volparse.c
@@ -13,11 +13,12 @@
 
 #include <afs/param.h>
 #include <afsconfig.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>