rename afs/assert.h to afs/afs_assert.h

provide a private assert header which does not
pollute the normal namespace for the assert header.

further changes will modify pthread operations to not use
generic assert as a "did it work", which breaks if NDEBUG is set

(cherry picked from commit 78502b61b3e8b288ce6fec1f66d14d7e2431642a)
Reviewed-on: http://gerrit.openafs.org/2995
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Change-Id: Iac34946f9de773ea7489cd75edba220bca2158e3
Reviewed-on: http://gerrit.openafs.org/3172
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index 0ed42436a719f7e47de8d5d6232122d5100c71d2..a612b29aac39731b75a567114564e6bb73a8e258 100644 (file)
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -1435,7 +1435,7 @@
                             <File Id="fileubik_int_H" Name="ubik_int.h" LongName="ubik_int.h" DiskId="1" src="$(var.IncDir)ubik_int.h" /> 
                         </Component>
                         <Directory Id="dirIncludeAfs" Name="afs">
-                            <Component Id="cmp_SDK_Include_afs" Guid="6F1F245C-BDD9-479A-A6D8-00A8F1AE8F86">
+                            <Component Id="cmp_SDK_Include_afs" Guid="DDAE87DF-AFA8-4EAF-BE9C-6A32D6D4ED06">
                                 <File Id="fileacl_H" Name="acl.h" LongName="acl.h" DiskId="1" src="$(var.IncDir)afs\acl.h" /> 
                                 <File Id="fileafscbint_H" Name="afscbint.h" LongName="afscbint.h" DiskId="1" src="$(var.IncDir)afs\afscbint.h" /> 
                                 <File Id="fileafsconfig_H" Name="AFSCON~1.h" LongName="afsconfig.h" DiskId="1" src="$(var.IncDir)afs\afsconfig.h" /> 
@@ -1468,7 +1468,7 @@
                                 <File Id="fileafs_sysnames_H" Name="AFS_SY~1.h" LongName="afs_sysnames.h" DiskId="1" src="$(var.IncDir)afs\afs_sysnames.h" /> 
                                 <File Id="fileafs_utilAdmin_H" Name="AFS_UT~1.h" LongName="afs_utilAdmin.h" DiskId="1" src="$(var.IncDir)afs\afs_utilAdmin.h" /> 
                                 <File Id="fileafs_vosAdmin_H" Name="AFS_VO~1.h" LongName="afs_vosAdmin.h" DiskId="1" src="$(var.IncDir)afs\afs_vosAdmin.h" /> 
-                                <File Id="fileassert_H" Name="assert.h" LongName="assert.h" DiskId="1" src="$(var.IncDir)afs\assert.h" /> 
+                                <File Id="fileassert_H" Name="AFS_AS~1.h" LongName="afs_assert.h" DiskId="1" src="$(var.IncDir)afs\afs_assert.h" /> 
                                 <File Id="fileaudit_H" Name="audit.h" LongName="audit.h" DiskId="1" src="$(var.IncDir)afs\audit.h" /> 
                                 <File Id="fileauth_H" Name="auth.h" LongName="auth.h" DiskId="1" src="$(var.IncDir)afs\auth.h" /> 
                                 <File Id="filebnode_H" Name="bnode.h" LongName="bnode.h" DiskId="1" src="$(var.IncDir)afs\bnode.h" /> 

diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h
index 0bd771683396979b28db63151a6bc8dff1443337..7ee3db3b828a35fa632ca1551e71af5b7969e6fb 100644 (file)
--- a/src/afs/UKERNEL/sysincludes.h
+++ b/src/afs/UKERNEL/sysincludes.h
@@ -17,7 +17,11 @@
 #include  <stdlib.h>
 #include  <string.h>
 #include  <limits.h>
+#ifdef AFS_PTHREAD_ENV
 #include  <assert.h>
+#else
+#include <afs/afs_assert.h>
+#endif
 #include  <stdarg.h>
 
 #if !defined(AFS_USR_DARWIN_ENV) && !defined(AFS_USR_FBSD_ENV) && !defined(AFS_USR_DFBSD_ENV) /* must be included after KERNEL undef'd */

diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c
index e399a4ec51bb4992c4750577900a39f75f9cb5be..e63209295c59f143e7dd49c7a5433cb8168008a4 100644 (file)
--- a/src/butc/tcmain.c
+++ b/src/butc/tcmain.c
@@ -30,7 +30,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif
 #include <afs/prs_fs.h>
 #include <afs/nfs.h>

diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c
index e447d583660f96c9d12a63d8feae196b0b9889f6..9efcbe89a503b874f7369f1d60f4526bb192593b 100644 (file)
--- a/src/butc/tcprocs.c
+++ b/src/butc/tcprocs.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <afs/procmgmt.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <afs/prs_fs.h>
 #include <sys/stat.h>
 #include <afs/nfs.h>

diff --git a/src/butc/tcudbprocs.c b/src/butc/tcudbprocs.c
index 5ccf654f7e9b4e1a25e5592869bd861c2c2cee32..82b3d0474b40ac854bbb38287a2d9199b2abeffd 100644 (file)
--- a/src/butc/tcudbprocs.c
+++ b/src/butc/tcudbprocs.c
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <afs/procmgmt.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <afs/prs_fs.h>
 #include <fcntl.h>
 #include <afs/nfs.h>

diff --git a/src/lwp/lock.c b/src/lwp/lock.c
index faab0bc2c9da1e01a53d809e5926be5e8da6cdae..d2897f93b08c420f75caa94397cd61df46e42933 100644 (file)
--- a/src/lwp/lock.c
+++ b/src/lwp/lock.c
@@ -26,8 +26,8 @@
 #include <afs/param.h>
 
 
-#ifdef AFS_PTHREAD_ENV
-#include <afs/assert.h>
+#ifndef AFS_PTHREAD_ENV
+#include <afs/afs_assert.h>
 #else /* AFS_PTHREAD_ENV */
 #include <assert.h>
 #endif /* AFS_PTHRED_ENV */

diff --git a/src/lwp/rw.c b/src/lwp/rw.c
index f814fd8220356b55463f88fc45432d79c1b3ce1c..a416515cf59dd157b05cf3588bfcdac73c744766 100644 (file)
--- a/src/lwp/rw.c
+++ b/src/lwp/rw.c
@@ -31,7 +31,7 @@ extern char *calloc();
 #include "lwp.h"
 #include "lock.h"
 #include "preempt.h"
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 
 #define DEFAULT_READERS        5
 

diff --git a/src/tsalvaged/salvsync-debug.c b/src/tsalvaged/salvsync-debug.c
index 1f2e48be5aefdfd46b8b100ba4522604341ad629..b7bea96fd19cd6f11e2a76b64e2e805082434861 100644 (file)
--- a/src/tsalvaged/salvsync-debug.c
+++ b/src/tsalvaged/salvsync-debug.c
@@ -38,7 +38,7 @@
 #endif
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <afs/dir.h>
 
 #include <fcntl.h>

diff --git a/src/tviced/serialize_state.c b/src/tviced/serialize_state.c
index a27cbda780048db7dbb99741038802082ced9af1..146ba0d8a4c8bd6e2d7e75c499d92e82f9a217c9 100644 (file)
--- a/src/tviced/serialize_state.c
+++ b/src/tviced/serialize_state.c
@@ -27,7 +27,7 @@
 #include <sys/time.h>
 #include <sys/file.h>
 #endif
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <sys/stat.h>
 
 #include <afs/stds.h>

diff --git a/src/tviced/state_analyzer.c b/src/tviced/state_analyzer.c
index 77f39d8dc6835672723dbbf4c2e628d0c70af9c1..5e8039494cf723ca0d5bea27a40d02f3a00a71c8 100644 (file)
--- a/src/tviced/state_analyzer.c
+++ b/src/tviced/state_analyzer.c
@@ -28,7 +28,7 @@
 
 #include <afs/stds.h>
 #include <rx/xdr.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <lwp.h>
 #include <lock.h>
 #include <afs/afsint.h>

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 0226e8f9fb0bf12eea7819c03712d1c5f5d8ada9..6fd3776cb8125c06eb3c1574b4548c88b47c43d9 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -24,7 +24,7 @@ objects = assert.o base64.o casestrcpy.o config_file.o ktime.o volparse.o \
 includes = \
        ${TOP_INCDIR}/afs/dirpath.h \
        ${TOP_INCDIR}/afs/pthread_nosigs.h \
-       ${TOP_INCDIR}/afs/assert.h \
+       ${TOP_INCDIR}/afs/afs_assert.h \
        ${TOP_INCDIR}/afs/errors.h \
        ${TOP_INCDIR}/afs/vice.h \
        ${TOP_INCDIR}/afs/remote.h \
@@ -56,7 +56,7 @@ ${TOP_INCDIR}/afs/dirpath.h: dirpath.h
 ${TOP_INCDIR}/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
        ${INSTALL_DATA} $? $@
 
-${TOP_INCDIR}/afs/assert.h: ${srcdir}/assert.h
+${TOP_INCDIR}/afs/afs_assert.h: ${srcdir}/afs_assert.h
        ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/errors.h: ${srcdir}/errors.h
@@ -234,7 +234,7 @@ install: dirpath.h util.a sys
        ${INSTALL} -d ${DESTDIR}${bindir}
        ${INSTALL_DATA} dirpath.h ${DESTDIR}${includedir}/afs/dirpath.h
        ${INSTALL_DATA} ${srcdir}/pthread_nosigs.h ${DESTDIR}${includedir}/afs/pthread_nosigs.h
-       ${INSTALL_DATA} ${srcdir}/assert.h ${DESTDIR}${includedir}/afs/assert.h
+       ${INSTALL_DATA} ${srcdir}/afs_assert.h ${DESTDIR}${includedir}/afs/afs_assert.h
        ${INSTALL_DATA} ${srcdir}/errors.h ${DESTDIR}${includedir}/afs/errors.h
        ${INSTALL_DATA} ${srcdir}/vice.h ${DESTDIR}${includedir}/afs/vice.h
        ${INSTALL_DATA} ${srcdir}/remote.h ${DESTDIR}${includedir}/afs/remote.h
@@ -259,7 +259,7 @@ dest: dirpath.h util.a sys
        ${INSTALL} -d ${DEST}/bin
        ${INSTALL_DATA} dirpath.h ${DEST}/include/afs/dirpath.h
        ${INSTALL_DATA} ${srcdir}/pthread_nosigs.h ${DEST}/include/afs/pthread_nosigs.h
-       ${INSTALL_DATA} ${srcdir}/assert.h ${DEST}/include/afs/assert.h
+       ${INSTALL_DATA} ${srcdir}/afs_assert.h ${DEST}/include/afs/afs_assert.h
        ${INSTALL_DATA} ${srcdir}/errors.h ${DEST}/include/afs/errors.h
        ${INSTALL_DATA} ${srcdir}/vice.h ${DEST}/include/afs/vice.h
        ${INSTALL_DATA} ${srcdir}/remote.h ${DEST}/include/afs/remote.h

diff --git a/src/util/NTMakefile b/src/util/NTMakefile
index 8c31d6f1057247b51b80978f4a36355c024e6e0b..2bd40ae0fa6ae5b788f412aaf6d19cbeb91b00cf 100644 (file)
--- a/src/util/NTMakefile
+++ b/src/util/NTMakefile
@@ -16,7 +16,7 @@ INCFILEDIR = $(DESTDIR)\include\afs  # header file install directory
 INCFILES =\
        $(DESTDIR)\include\dirent.h \
        $(INCFILEDIR)\afsutil.h \
-       $(INCFILEDIR)\assert.h \
+       $(INCFILEDIR)\afs_assert.h \
        $(INCFILEDIR)\errors.h \
        $(INCFILEDIR)\itc.h \
        $(INCFILEDIR)\vice.h \

diff --git a/src/util/afs_assert.h b/src/util/afs_assert.h
new file mode 100644 (file)
index 0000000..51f01c6
--- /dev/null
+++ b/src/util/afs_assert.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ *
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+/*     @(#)assert.h 1.1 83/08/01 SMI; from UCB 4.1 83/05/03    */
+/* Modified to dump core, rather than exit.  May/85 RNS */
+
+void AssertionFailed(char *file, int line) AFS_NORETURN;
+
+#define assert(ex) do{if (!(ex)) AssertionFailed(__FILE__, __LINE__);}while(0)

diff --git a/src/util/assert.h b/src/util/assert.h
deleted file mode 100644 (file)
index 51f01c6..0000000
--- a/src/util/assert.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- *
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-/*     @(#)assert.h 1.1 83/08/01 SMI; from UCB 4.1 83/05/03    */
-/* Modified to dump core, rather than exit.  May/85 RNS */
-
-void AssertionFailed(char *file, int line) AFS_NORETURN;
-
-#define assert(ex) do{if (!(ex)) AssertionFailed(__FILE__, __LINE__);}while(0)

diff --git a/src/util/dirpath.c b/src/util/dirpath.c
index abb1406e3927ca053d55c9fd6820a16ca3f0240c..7469b64af351aed16dfa5c09bd19a2cb526feff2 100644 (file)
--- a/src/util/dirpath.c
+++ b/src/util/dirpath.c
@@ -18,7 +18,7 @@
 #include <limits.h>
 #include <errno.h>
 #include <stdio.h>
-#include "assert.h"
+#include "afs_assert.h"
 #include "afsutil.h"
 #include "fileutil.h"
 #ifdef AFS_PTHREAD_ENV

diff --git a/src/util/netutils.c b/src/util/netutils.c
index 129949d736392615623a585012a12f6714720e68..7dc2ac9b378d1d3f28b0d89facaa778e7bad45b7 100644 (file)
--- a/src/util/netutils.c
+++ b/src/util/netutils.c
@@ -42,7 +42,11 @@
 
 #include <rx/rx.h>
 
-#include "assert.h"
+#ifdef AFS_PTHREAD_ENV
+#include <assert.h>
+#else
+#include "afs_assert.h"
+#endif
 #include "afsutil.h"
 #include <afs/dirpath.h>
 

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index 887ac573e3c75a7f66d54aed8b0ca675e1661e50..fc831e70047b1e992fce2e85cac04130aee7cfbc 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -64,7 +64,7 @@
 #include <afs/stds.h>
 #include <rx/xdr.h>
 #include <afs/nfs.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <lwp.h>
 #include <lock.h>
 #include <afs/afsint.h>

diff --git a/src/viced/callback.c b/src/viced/callback.c
index 5555391c7ef8f2af41845e7178dce88a3814174e..23e08a62f89f6eafb1ce399cbd84cea15e1f6081 100644 (file)
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -97,7 +97,7 @@
 #include <sys/file.h>
 #include <unistd.h>
 #endif
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 
 #include <afs/stds.h>
 

diff --git a/src/viced/host.c b/src/viced/host.c
index a390af9640e983dc251a2ab6407bc4a16e119efe..0b9427350987b06dafe0945dfdbe223cfdddbd8b 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -27,7 +27,7 @@
 
 #include <afs/stds.h>
 #include <rx/xdr.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <lwp.h>
 #include <lock.h>
 #include <afs/afsint.h>

diff --git a/src/viced/physio.c b/src/viced/physio.c
index 6021a53e12dea792361b4e5ea65d5612abae72c2..cf9ed61bed335edf980e517578107589e6570e72 100644 (file)
--- a/src/viced/physio.c
+++ b/src/viced/physio.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #endif
 #include <afs/nfs.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <lwp.h>
 #include <lock.h>
 #include <time.h>

diff --git a/src/viced/viced.c b/src/viced/viced.c
index 26d99e3c950cb41721eabcc9366234abedce3f57..e94bbff30d3df187a9b83992500fa01be3e53b1f 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -55,7 +55,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <lwp.h>
 #include <lock.h>

diff --git a/src/vol/clone.c b/src/vol/clone.c
index 405176a99c73e8e992ddc2ccabff9bdb816a327e..adc3f86fb60abc0d0c85f116c2d5635604d541f9 100644 (file)
--- a/src/vol/clone.c
+++ b/src/vol/clone.c
@@ -24,7 +24,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>

diff --git a/src/vol/fssync-client.c b/src/vol/fssync-client.c
index 3ee5206819438a8af2717304b019ff3a7d940bc6..10c05a0f6f76f5a058366c7d97518d5f9875acef 100644 (file)
--- a/src/vol/fssync-client.c
+++ b/src/vol/fssync-client.c
@@ -52,7 +52,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <signal.h>
 #include <string.h>

diff --git a/src/vol/fssync-debug.c b/src/vol/fssync-debug.c
index 49603f70a3916aabc2b3be04ba6157058ca6383b..ea2aa441f0440b1da74bffc5073bde07db5d9145 100644 (file)
--- a/src/vol/fssync-debug.c
+++ b/src/vol/fssync-debug.c
@@ -38,7 +38,7 @@
 #endif
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 
 #include <fcntl.h>
 

diff --git a/src/vol/fssync-server.c b/src/vol/fssync-server.c
index 62dd7523a7214fc197618d5f897523a5c1403308..3c6eb09a00bcbdf5f5ef6b351391dc350387c6f8 100644 (file)
--- a/src/vol/fssync-server.c
+++ b/src/vol/fssync-server.c
@@ -64,7 +64,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <signal.h>
 #include <string.h>

diff --git a/src/vol/ihandle.c b/src/vol/ihandle.c
index 096f34d748a5f2449083c9ddb4aef2b9f4313a73..54c9bf607382c90e08410c14bef98470348478b4 100644 (file)
--- a/src/vol/ihandle.c
+++ b/src/vol/ihandle.c
@@ -41,7 +41,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include "afs/assert.h"
+#include "afs/afs_assert.h"
 #endif /* AFS_PTHREAD_ENV */
 #include <limits.h>
 

diff --git a/src/vol/listinodes.c b/src/vol/listinodes.c
index 8d7460444e265cef88ab2f4d7b3a5e2fb1ff97e6..9773f2eba2b4d07a4b556c4ba609b66df744c025 100644 (file)
--- a/src/vol/listinodes.c
+++ b/src/vol/listinodes.c
@@ -102,7 +102,7 @@ ListViceInodes(char *devname, char *mountedOn, FILE *inodeFile,
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #if defined(AFS_HPUX101_ENV)
 #include <unistd.h>

diff --git a/src/vol/namei_ops.c b/src/vol/namei_ops.c
index bd55fc36f19c7521768267fa57716d76564e01b1..d31edeabfabd7ceabf6d4a9829dbe1efb20c6949 100644 (file)
--- a/src/vol/namei_ops.c
+++ b/src/vol/namei_ops.c
@@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <string.h>
 #include <sys/file.h>
 #include <sys/param.h>

diff --git a/src/vol/ntops.c b/src/vol/ntops.c
index 6e0c59e546064b011bb11e1566f42c000eaaabae..48b51f0e888d6eb4568fca5075f8d02fb09e16c6 100644 (file)
--- a/src/vol/ntops.c
+++ b/src/vol/ntops.c
@@ -34,7 +34,7 @@
 #include "volume.h"
 #include "viceinode.h"
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <afs/errmap_nt.h>
 
 #define BASEFILEATTRIBUTE FILE_ATTRIBUTE_NORMAL

diff --git a/src/vol/nuke.c b/src/vol/nuke.c
index 7a89da8eac642fdd2e05339f5e667fe1a71653f9..151f0bd621a8e34cb0606b6c88b30c0e08512e46 100644 (file)
--- a/src/vol/nuke.c
+++ b/src/vol/nuke.c
@@ -17,7 +17,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <sys/stat.h>
 #include <fcntl.h>

diff --git a/src/vol/partition.c b/src/vol/partition.c
index d3f0a8006c67827361cd19d42b33289edced6f49..3ec83b656c12ba4c48c6f2dc806f9bc386b1d5b3 100644 (file)
--- a/src/vol/partition.c
+++ b/src/vol/partition.c
@@ -130,7 +130,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 
 #if defined(AFS_HPUX_ENV)

diff --git a/src/vol/purge.c b/src/vol/purge.c
index 47bce55df1ee12fa6bef4fc05071c2fed923795f..6ced3fbcd150e1998f0912b35f8ee2b084c6da9f 100644 (file)
--- a/src/vol/purge.c
+++ b/src/vol/purge.c
@@ -29,7 +29,7 @@
 #endif
 #include <string.h>
 #include <sys/stat.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <afs/afsutil.h>
 
 #include <rx/xdr.h>

diff --git a/src/vol/salvaged.c b/src/vol/salvaged.c
index 85ac10b65a3b693ac15f5219862145c1a98c3bfe..563222ff5197d53aa7a09fc9b712ceb2d14c9a29 100644 (file)
--- a/src/vol/salvaged.c
+++ b/src/vol/salvaged.c
@@ -41,7 +41,7 @@
 #endif
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #if !defined(AFS_SGI_ENV) && !defined(AFS_NT40_ENV)
 #if defined(AFS_VFSINCL_ENV)
 #include <sys/vnode.h>

diff --git a/src/vol/salvager.c b/src/vol/salvager.c
index 4cc0a49a5f7e1a5755d021dd862cb2b3e6445de0..e2708ae9aa20c156bfbb76fdb4fb79703711a0b0 100644 (file)
--- a/src/vol/salvager.c
+++ b/src/vol/salvager.c
@@ -43,7 +43,7 @@
 #endif
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #if !defined(AFS_SGI_ENV) && !defined(AFS_NT40_ENV)
 #if defined(AFS_VFSINCL_ENV)
 #include <sys/vnode.h>

diff --git a/src/vol/test/listVicepx.c b/src/vol/test/listVicepx.c
index 0dda161843ec549bb28c987517ea5063dbced668..fe75420c22c0ef858bd211d14fcc796545526497 100644 (file)
--- a/src/vol/test/listVicepx.c
+++ b/src/vol/test/listVicepx.c
@@ -97,7 +97,7 @@
 #include "volume.h"
 #include "vldb.h"
 #include "partition.h"
-#include "afs/assert.h"
+#include "afs/afs_assert.h"
 #include "filesignal.h"
 #include "vutils.h"
 #include "daemon_com.h"

diff --git a/src/vol/test/nicreate.c b/src/vol/test/nicreate.c
index fb377ed8cb5cfa3a31b0c9e18fe6c1ad0c7e8d97..7863c05f1642387174b6d592e028912702a35502 100644 (file)
--- a/src/vol/test/nicreate.c
+++ b/src/vol/test/nicreate.c
@@ -33,7 +33,7 @@
 #include "voldefs.h"
 #include "partition.h"
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 
 
 char *prog = "nicreate";

diff --git a/src/vol/test/nincdec.c b/src/vol/test/nincdec.c
index c0f82a309771d9ff1efb86fac802d5322bcbcd59..6ad457a5adaa645d62ceca3a328bb9a615e59838 100644 (file)
--- a/src/vol/test/nincdec.c
+++ b/src/vol/test/nincdec.c
@@ -33,7 +33,7 @@
 #include "voldefs.h"
 #include "partition.h"
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 
 
 char *prog = "nincdec";

diff --git a/src/vol/test/nsubr.c b/src/vol/test/nsubr.c
index d0f9b52aef35da82f9edcf46e022f076d578778d..1b21fca5ae7a9279d54203fe0665c0fd676c529f 100644 (file)
--- a/src/vol/test/nsubr.c
+++ b/src/vol/test/nsubr.c
@@ -29,7 +29,7 @@
 #include "voldefs.h"
 #include "partition.h"
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 
 
 

diff --git a/src/vol/test/updateDirInode.c b/src/vol/test/updateDirInode.c
index aeb9870ff9ea5181e3eed001a50cdca0f5344223..7bac28e5167599c309672fe2a4be11eb50006285 100644 (file)
--- a/src/vol/test/updateDirInode.c
+++ b/src/vol/test/updateDirInode.c
@@ -97,7 +97,7 @@
 #include "volume.h"
 #include "vldb.h"
 #include "partition.h"
-#include "afs/assert.h"
+#include "afs/afs_assert.h"
 #include "filesignal.h"
 #include "vutils.h"
 #include "daemon_com.h"

diff --git a/src/vol/vg_cache.c b/src/vol/vg_cache.c
index e9278ef92dd7050a82464512e322c3503508f45f..ce6376da5a523385b0271278491fe94f7d9023bb 100644 (file)
--- a/src/vol/vg_cache.c
+++ b/src/vol/vg_cache.c
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <string.h>
 #ifdef AFS_NT40_ENV
 #include <io.h>

diff --git a/src/vol/vg_scan.c b/src/vol/vg_scan.c
index 76dd43ffc6239fa5c1d0553ccc9a33653e4d1f89..df875912157df843ecddae0a0ecb9e9bd5f8b089 100644 (file)
--- a/src/vol/vg_scan.c
+++ b/src/vol/vg_scan.c
@@ -24,7 +24,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <string.h>
 #ifdef AFS_NT40_ENV
 #include <io.h>

diff --git a/src/vol/vnode.c b/src/vol/vnode.c
index 45cfa858ccbfd9f0ba74711d268d0e764468e5f8..5f0db2abec128849dff7274b9007024d7f5ea78e 100644 (file)
--- a/src/vol/vnode.c
+++ b/src/vol/vnode.c
@@ -27,7 +27,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 
 #include <rx/xdr.h>

diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index 1e8448495161c584d08d70b75f815dc5f87edbac..76b3e668db49718227cc0660c1ed5fe49e891dc2 100644 (file)
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -110,7 +110,7 @@ Vnodes with 0 inode pointers in RW volumes are now deleted.
 #endif
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #if !defined(AFS_SGI_ENV) && !defined(AFS_NT40_ENV)
 #if defined(AFS_VFSINCL_ENV)
 #include <sys/vnode.h>

diff --git a/src/vol/volume.c b/src/vol/volume.c
index aec2bcb72b930992801dca57dc3f4c6045e1f8dd..7929128909f54c93011f81cd9b1bcdce9fbf8f58 100644 (file)
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -128,7 +128,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include "afs/assert.h"
+#include "afs/afs_assert.h"
 #endif /* AFS_PTHREAD_ENV */
 #include "vutils.h"
 #ifndef AFS_NT40_ENV

diff --git a/src/vol/vutil.c b/src/vol/vutil.c
index c53ea0e2f7fc0195b8e111e364e41f037ae1c01d..e065646235e0e913932db01ac2a6183449ef9c5e 100644 (file)
--- a/src/vol/vutil.c
+++ b/src/vol/vutil.c
@@ -34,7 +34,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 
 #include <rx/xdr.h>

diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c
index 1ec359c0f2ab041e3021f6ccf03f8dc3112c8305..78e28d29964e648d07dc88af3eaad13a41236af8 100644 (file)
--- a/src/volser/dumpstuff.c
+++ b/src/volser/dumpstuff.c
@@ -29,7 +29,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <rx/xdr.h>
 #include <rx/rx.h>

diff --git a/src/volser/physio.c b/src/volser/physio.c
index 35be2f12c4260e4b63df15d48de15f19dcf6cf2b..e9025bb2a64245c22931cbfcd2e39f23d5a92720 100644 (file)
--- a/src/volser/physio.c
+++ b/src/volser/physio.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <afs/afsint.h>
 #include <afs/nfs.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <afs/dir.h>
 #include <afs/ihandle.h>
 #include "vol.h"

diff --git a/src/volser/vol_split.c b/src/volser/vol_split.c
index c14cfd4ed661bed587455ced7d28d10e4b921c75..71e285df026b4d3dbd5dd3e3c6693165e3bc8c56 100644 (file)
--- a/src/volser/vol_split.c
+++ b/src/volser/vol_split.c
@@ -14,7 +14,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>

diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index b2f5605432dcfa595aeab37303776fc5a6b1690e..cbe53fa1b3c8aeaed897a447223917c9a6f5d134 100644 (file)
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -34,7 +34,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <afs/prs_fs.h>
 #include <afs/nfs.h>

diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c
index 8f398092d4f6b01482e706bac114f992eb163c5c..8155a399862d85c7c725bbb2945f9816b57bd661 100644 (file)
--- a/src/volser/volprocs.c
+++ b/src/volser/volprocs.c
@@ -37,7 +37,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <afs/prs_fs.h>
 #include <afs/nfs.h>

diff --git a/src/volser/voltrans.c b/src/volser/voltrans.c
index b350fa3839060a96436d4a8e1266d751d403301b..3fe499d8cf6135f547349515b94a839ed756104d 100644 (file)
--- a/src/volser/voltrans.c
+++ b/src/volser/voltrans.c
@@ -43,7 +43,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <afs/prs_fs.h>
 #include <afs/nfs.h>