#include <afs/param.h>
#include <roken.h>
+#include <afs/opr.h>
#include <afs/stds.h>
#include <afs/com_err.h>
#include <afs/cmd.h>
#include <time.h>
#include <winsock2.h>
#include <errno.h>
-#include <afs/afs_assert.h>
+#include <afs/opr_assert.h>
#include <rx/rx_globals.h>
#include <osi.h>
#include <afs/param.h>
#include <roken.h>
+#include <afs/opr.h>
#include <afs/stds.h>
#include <afs/afs_consts.h>
#include <malloc.h>
#include <string.h>
#include <strsafe.h>
-#include <afs/afs_assert.h>
+#include <afs/opr_assert.h>
#include <afs/ptserver.h>
#include <afs/ptuser.h>
#include <afs/param.h>
#include <roken.h>
+#include <afs/opr.h>
#include <afs/stds.h>
#include <afs/afs_consts.h>
#include <afsd.h>
#include <smb.h>
#include <afs/cmd.h>
+#include <afs/opr_assert.h>
#include <fs_utils.h>
#include <WINNT\afsreg.h>
#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 */
#define VFS 1
#include <afs/stds.h>
+#include <afs/opr.h>
+#include <afs/opr_assert.h>
#include <afs/cmd.h>
#include "afsd.h"
-#include <afs/afs_assert.h>
#include <afs/afsutil.h>
#include <stdlib.h>
#include <stdio.h>
FMSLIBS=${TOP_LIBDIR}/libcmd.a \
${TOP_LIBDIR}/libusd.a \
${XLIBS} \
- ${TOP_LIBDIR}/util.a
+ ${TOP_LIBDIR}/util.a \
+ $(TOP_LIBDIR)/libopr.a
fms: fms.o
$(AFS_LDRULE) fms.o ${FMSLIBS} $(LIB_roken)
$(CC) $(AFS_CPPFLAGS) $(AFS_CFLAGS) $(AFS_LDFLAGS) \
-o read_tape ${srcdir}/read_tape.c \
${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libusd.a \
- ${TOP_LIBDIR}/util.a $(LIB_roken)
+ ${TOP_LIBDIR}/util.a $(TOP_LIBDIR)/libopr.a \
+ $(LIB_roken)
# Errors
CFLAGS_tcudbprocs.o=@CFLAGS_NOERROR@
#include <rx/xdr.h>
#include <afs/afsint.h>
-#include <afs/afs_assert.h>
#include <afs/prs_fs.h>
#include <afs/nfs.h>
#include <afs/vlserver.h>
#include <afs/procmgmt.h>
#include <roken.h>
-#include <rx/xdr.h>
+#include <afs/opr.h>
#include <rx/rx.h>
#include <afs/afsint.h>
-#include <afs/afs_assert.h>
#include <afs/prs_fs.h>
#include <afs/nfs.h>
#include <lwp.h>
# pragma GCC diagnostic warning "-Wimplicit-function-declaration"
#endif
-#include <rx/xdr.h>
+#include <afs/opr.h>
#include <rx/rx.h>
#include <afs/afsint.h>
-#include <afs/afs_assert.h>
#include <afs/prs_fs.h>
#include <afs/nfs.h>
#include <lwp.h>
LIBACLOBJS=aclprocs.o netprocs.o
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o
+UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o
DIROBJS=buffer.o dir.o salvage.o
serialize_state.o: ${TVICED}/serialize_state.c
$(AFS_CCRULE) $(TVICED)/serialize_state.c
-assert.o: ${UTIL}/assert.c
- $(AFS_CCRULE) $(UTIL)/assert.c
-
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
LIBACLOBJS=aclprocs.o netprocs.o
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o
+UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o
DIROBJS=buffer.o dir.o salvage.o
${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
${TOP_LIBDIR}/libafsutil.a \
+ ${TOP_LIBDIR}/libopr.a \
${TOP_LIBDIR}/libusd.a
all: davolserver
lockprocs.o: ${VOLSER}/lockprocs.c
$(AFS_CCRULE) $(VOLSER)/lockprocs.c
-assert.o: ${UTIL}/assert.c
- $(AFS_CCRULE) $(UTIL)/assert.c
-
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
${TOP_LIBDIR}/libauth.a \
${TOP_LIBDIR}/librxkad.a \
${TOP_LIBDIR}/libafscom_err.a \
+ ${TOP_LIBDIR}/libopr.a \
${TOP_LIBDIR}/util.a
EXTRA_LIBS=${LIB_curses} ${XLIBS}
#include <roken.h>
#include <afs/opr.h>
+#include <afs/opr_assert.h>
#include <ctype.h>
$(DESTDIR)\lib\afsrpc.lib \
$(DESTDIR)\lib\afspthread.lib \
$(DESTDIR)\lib\afs\afsutil.lib \
+ $(DESTDIR)\lib\opr.lib \
$(DESTDIR)\lib\afsroken.lib
$(DLLFILE): $(DLLOBJS) $(DLLLIBS)
com_err.o: ${COMERR}/com_err.c
$(AFS_CCRULE) $(COMERR)/com_err.c
-
casestrcpy.o: ${OPR}/casestrcpy.c
$(AFS_CCRULE) $(OPR)/casestrcpy.c
-assert.o: ${UTIL}/assert.c
- $(AFS_CCRULE) $(UTIL)/assert.c
+assert.o: ${OPR}/assert.c
+ $(AFS_CCRULE) $(OPR)/assert.c
base64.o: ${UTIL}/base64.c
$(AFS_CCRULE) $(UTIL)/base64.c
$(CRULE1)
$(UOBJ)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
$(CRULE1) -o afs_uuid.o
-$(UOBJ)/assert.o: $(TOP_SRCDIR)/util/assert.c
+$(UOBJ)/assert.o: $(TOP_SRCDIR)/opr/assert.c
$(CRULE1)
$(UOBJ)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
$(CRULE1)
$(CRULEPIC)
$(PICOBJ)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
$(CRULEPIC) -o afs_uuid.o
-$(PICOBJ)/assert.o: $(TOP_SRCDIR)/util/assert.c
+$(PICOBJ)/assert.o: $(TOP_SRCDIR)/opr/assert.c
$(CRULEPIC)
$(PICOBJ)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
$(CRULEPIC)
$(CRULE2)
$(WEBOBJ)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
$(CRULE2) -o afs_uuid.o
-$(WEBOBJ)/assert.o: $(TOP_SRCDIR)/util/assert.c
+$(WEBOBJ)/assert.o: $(TOP_SRCDIR)/opr/assert.c
$(CRULE1)
$(WEBOBJ)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
$(CRULE2)
$(CRULE1)
$(JUAFS)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
$(CRULE1) -o afs_uuid.o
-$(JUAFS)/assert.o: $(TOP_SRCDIR)/util/assert.c
+$(JUAFS)/assert.o: $(TOP_SRCDIR)/opr/assert.c
$(CRULE1)
$(JUAFS)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
$(CRULE1)
#include <roken.h>
#ifdef AFS_PTHREAD_ENV
-#include <afs/afs_assert.h>
-/* can't include this in lwp, rx hasn't built yet */
-
#include <rx/rx.h>
-#else
-#include <assert.h>
#endif
+#include <assert.h>
+
#include "lwp.h"
#include "lock.h"
#ifdef AFS_PTHREAD_ENV
#include <pthread.h>
-#include <afs/afs_assert.h>
/* can't include in non-lwp case; rx builds later */
#include <rx/rx.h>
#define LOCK_LOCK(A) MUTEX_ENTER(&(A)->mutex);
objects = assert.o casestrcpy.o
all: $(TOP_INCDIR)/afs/opr.h \
+ $(TOP_INCDIR)/afs/opr_assert.h \
$(TOP_LIBDIR)/libopr.a
libopr.a: $(objects)
$(TOP_INCDIR)/afs/opr.h: opr.h
$(INSTALL_DATA) opr.h $@
+$(TOP_INCDIR)/afs/opr_assert.h: opr_assert.h
+ $(INSTALL_DATA) opr_assert.h $@
+
install: libopr.a
$(INSTALL_DATA) libopr.a $(DESTDIR)$(libdir)/libopr.a
INCFILEDIR = $(DESTDIR)\include\afs
INCFILES = \
- $(INCFILEDIR)\opr.h
+ $(INCFILEDIR)\opr.h \
+ $(INCFILEDIR)\opr_assert.h
LIBFILE = $(DESTDIR)\lib\opr.lib
}
#endif
+#define TIMESTAMP_BUFFER_SIZE 26 /* including the null */
+void
+opr_AssertionFailed(char *file, int line)
+{
+ char tdate[TIMESTAMP_BUFFER_SIZE];
+ time_t when;
+ struct tm tm;
+
+ when = time(NULL);
+ strftime(tdate, sizeof(tdate), "%a %b %d %H:%M:%S %Y",
+ localtime_r(&when, &tm));
+ fprintf(stderr, "%s Assertion failed! file %s, line %d.\n", tdate, file,
+ line);
+ fflush(stderr);
+ opr_abort();
+}
+
+void
+opr_AssertFailU(const char *expr, const char *file, int line)
+{
+ fprintf(stderr, "Fatal Rx error: assertion failed: %s, "
+ "file: %s, line: %d\n",
+ expr, file, line);
+ fflush(stderr);
+ fflush(stdout);
+ opr_abort();
+}
# define opr_abort() abort()
#endif
+extern void opr_AssertionFailed(char *, int);
+extern void opr_AssertFailU(const char *, const char *, int);
+#define opr_Assert(ex) \
+ do {if (!(ex)) opr_AssertionFailed(__FILE__, __LINE__);} while(0)
+
+/* casestrcpy.c */
#define lcstring opr_lcstring
#define ucstring opr_ucstring
#define stolower opr_stolower
--- /dev/null
+/* Include this header if you want the standard 'assert()' macro to have the
+ * same behaviour as the new opr_Assert macro
+ */
+#include <afs/opr.h>
+
+#define assert(ex) opr_Assert(ex)
casestrcpy.o: ${OPR}/casestrcpy.c
$(AFS_CCRULE) $(OPR)/casestrcpy.c
-assert.o: ${UTIL}/assert.c
- $(AFS_CCRULE) $(UTIL)/assert.c
+assert.o: ${OPR}/assert.c
+ $(AFS_CCRULE) $(OPR)/assert.c
base64.o: ${UTIL}/base64.c
$(AFS_CCRULE) $(UTIL)/base64.c
opr_stolower;
opr_ucstring;
opr_lcstring;
- AssertionFailed;
+ opr_AssertionFailed;
rx_GetLocalPeers;
rx_GetMaxReceiveWindow;
rx_GetMaxSendWindow;
RXOBJS= rx_pthread.o rxkad_errs.o
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
+UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o
${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
${TOP_LIBDIR}/libcmd.a \
+ $(TOP_LIBDIR)/libopr.a \
${TOP_LIBDIR}/libafsutil.a
COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o ol_verify.o
# pthreaded version of this library, as we are doing with ubik itself, but...
#
-assert.o: ${UTIL}/assert.c
- $(AFS_CCRULE) $(UTIL)/assert.c
-
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
RXOBJS= rx_pthread.o rxkad_errs.o
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
+UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o \
pthread_threadname.o
${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
${TOP_LIBDIR}/libcmd.a \
+ ${TOP_LIBDIR}/libopr.a \
${TOP_LIBDIR}/libafsutil.a
PTOBJS=ptuser.o pterror.o ptint.cs.o ptint.xdr.o
LWPOBJS=lock.o threadname.o
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o fstab.o
+UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o fstab.o
VLIBOBJS=volume.o vnode.o vutil.o partition.o fssync-client.o \
clone.o nuke.o devname.o listinodes.o ihandle.o \
fssync-debug.o: ${VOL}/fssync-debug.c
$(AFS_CCRULE) $(VOL)/fssync-debug.c
-assert.o: ${UTIL}/assert.c
- $(AFS_CCRULE) $(UTIL)/assert.c
-
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
#include <rx/xdr.h>
#include <afs/afsint.h>
-#include <afs/afs_assert.h>
+#include <afs/opr_assert.h>
#include <afs/dir.h>
#ifndef AFS_NT40_ENV
RXOBJS = rx_pthread.o
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
+UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o \
pthread_threadname.o
LIBS=${RXOBJS} ${UTILOBJS} ${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \
${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/libcmd.a \
- ${TOP_LIBDIR}/libsys.a ${XLIBS} ${MT_LIBS}
+ ${TOP_LIBDIR}/libsys.a \
+ $(TOP_LIBDIR)/libopr.a \
+ ${XLIBS} ${MT_LIBS}
all: depinstall ${TOP_LIBDIR}/libubik_pthread.a udebug utst_server utst_client
# pthreaded version of this library, as we are doing with ubik itself, but...
#
-assert.o: ${UTIL}/assert.c
- $(AFS_CCRULE) $(UTIL)/assert.c
-
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
LIBACLOBJS=aclprocs.o netprocs.o
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o pthread_threadname.o
+UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o pthread_threadname.o
DIROBJS=buffer.o dir.o salvage.o
LIBS=${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
$(TOP_LIBDIR)/libcmd.a \
+ $(TOP_LIBDIR)/libopr.a \
${TOP_LIBDIR}/util.a
all: fileserver
#include <roken.h>
#include <afs/stds.h>
-#include <afs/afs_assert.h>
#include <rx/xdr.h>
#include <lwp.h>
#include <sys/mman.h>
#include <rx/xdr.h>
-#include <afs/afs_assert.h>
+#include <afs/opr_assert.h>
#include <lwp.h>
#include <lock.h>
#include <afs/afsint.h>
RXOBJS= rx_pthread.o rxkad_errs.o
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
+UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o \
pthread_threadname.o get_krbrlm.o
${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libcmd.a \
${TOP_LIBDIR}/libafsrpc.a \
- ${TOP_LIBDIR}/libafsutil.a
+ ${TOP_LIBDIR}/libafsutil.a \
+ ${TOP_LIBDIR}/libopr.a
OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o ${RXOBJS} ${UTILOBJS}
# pthreaded version of this library, as we are doing with ubik itself, but...
#
-assert.o: ${UTIL}/assert.c
- $(AFS_CCRULE) $(UTIL)/assert.c
-
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
LIBACLOBJS=aclprocs.o netprocs.o
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o pthread_threadname.o
+UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o pthread_threadname.o
DIROBJS=buffer.o dir.o salvage.o
${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsutil.a \
${TOP_LIBDIR}/libusd.a \
- ${TOP_LIBDIR}/libafsrpc.a
+ ${TOP_LIBDIR}/libafsrpc.a \
+ $(TOP_LIBDIR)/libopr.a
all: volserver vos
lockprocs.o: ${VOLSER}/lockprocs.c
$(AFS_CCRULE) $(VOLSER)/lockprocs.c
-assert.o: ${UTIL}/assert.c
- $(AFS_CCRULE) $(UTIL)/assert.c
-
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
#include <afs/param.h>
#include <roken.h>
-
+#include <afs/opr.h>
#include <lock.h>
#include <rx/xdr.h>
#include <rx/rx.h>
#include <errno.h>
+#include <assert.h>
#include <afs/afsutil.h>
#define UBIK_INTERNALS
#define CFLastFailed 1 /*!< last call failed to this guy (to detect down hosts) */
/*\}*/
-#include <afs/afs_assert.h>
#ifdef AFS_PTHREAD_ENV
#include <pthread.h>
#else
return 0;
}
-#include <afs/afs_assert.h>
#ifdef AFS_PTHREAD_ENV
#include <pthread.h>
#include <afs/param.h>
#include <roken.h>
+#include <afs/opr.h>
#if defined(AFS_AIX_ENV)
#include <sys/tape.h>
#endif
#endif /* AFS_AIX_ENV */
-#include <afs/afs_assert.h>
-
#include "usd.h"
#ifdef O_LARGEFILE
#endif /* O_LARGEFILE */
/* make sure both lock bits aren't set */
- assert(~flags & (USD_OPEN_RLOCK | USD_OPEN_WLOCK));
+ opr_Assert(~flags & (USD_OPEN_RLOCK | USD_OPEN_WLOCK));
fl.l_type = ((flags & USD_OPEN_RLOCK) ? F_RDLCK : F_WRLCK);
fl.l_whence = SEEK_SET;
HELPER_SPLINT=@HELPER_SPLINT@
-objects =assert.o base64.o config_file.o ktime.o volparse.o \
+objects =base64.o config_file.o ktime.o volparse.o \
hostparse.o exec.o \
hputil.o kreltime.o get_krbrlm.o uuid.o serverLog.o \
dirpath.o fileutil.o netutils.o flipbase64.o fstab.o \
pthread_threadname.o ${REGEX_OBJ}
objects_pic = \
- assert_pic.o \
base64_pic.o \
config_file_pic.o \
ktime_pic.o \
includes = \
${TOP_INCDIR}/afs/dirpath.h \
${TOP_INCDIR}/afs/pthread_nosigs.h \
- ${TOP_INCDIR}/afs/afs_assert.h \
${TOP_INCDIR}/afs/errors.h \
${TOP_INCDIR}/afs/vice.h \
${TOP_INCDIR}/afs/ktime.h \
${TOP_INCDIR}/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
${INSTALL_DATA} $? $@
-${TOP_INCDIR}/afs/afs_assert.h: ${srcdir}/afs_assert.h
- ${INSTALL_DATA} $? $@
-
${TOP_INCDIR}/afs/errors.h: ${srcdir}/errors.h
${INSTALL_DATA} $? $@
$(AFS_LDRULE) sys.o
# PIC objects build rules
-assert_pic.o: ${srcdir}/assert.c ${includes}
- $(SHD_CCRULE) ${srcdir}/assert.c
-
base64_pic.o: ${srcdir}/base64.c ${includes}
$(SHD_CCRULE) ${srcdir}/base64.c
${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}/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}/ktime.h ${DESTDIR}${includedir}/afs/ktime.h
${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}/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}/ktime.h ${DEST}/include/afs/ktime.h
$(DESTDIR)\include\dirent.h \
$(DESTDIR)\include\opr\queue.h \
$(INCFILEDIR)\afsutil.h \
- $(INCFILEDIR)\afs_assert.h \
$(INCFILEDIR)\errors.h \
$(INCFILEDIR)\vice.h \
$(INCFILEDIR)\netutils.h \
MT_LIBFILE = $(DESTDIR)\lib\afs\mtafsutil.lib
LIBOBJS = \
- $(OUT)\assert.obj \
$(OUT)\base32.obj \
$(OUT)\get_krbrlm.obj \
$(OUT)\hostparse.obj \
$(OUT)\secutil_nt.obj
MT_LIBOBJS = \
- $(OUT)\assert.obj \
$(OUT)\base32.obj \
$(OUT)\get_krbrlm.obj \
$(OUT)\hostparse.obj \
+++ /dev/null
-/*
- * 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)
/* afs_lhash.c */
-
-/* assert.c */
-extern void AssertionFailed(char *file, int line);
-
-
/* base32.c */
extern char *int_to_base32(b32_string_t s, int a);
extern int base32_to_int(char *s);
+++ /dev/null
-/*
- * 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
- */
-
-/* ReallyAbort: called from assert. May/85 */
-#include <afsconfig.h>
-#include <afs/param.h>
-
-#include <roken.h>
-#include <afs/opr.h>
-
-#include "afsutil.h"
-
-#define TIMESTAMP_BUFFER_SIZE 26 /* including the null */
-
-void
-AssertionFailed(char *file, int line)
-{
- char tdate[TIMESTAMP_BUFFER_SIZE];
- time_t when;
- struct tm tm;
-
- when = time(NULL);
- strftime(tdate, sizeof(tdate), "%a %b %d %H:%M:%S %Y",
- localtime_r(&when, &tm));
- fprintf(stderr, "%s Assertion failed! file %s, line %d.\n", tdate, file,
- line);
- fflush(stderr);
- opr_abort();
-}
#include <ctype.h>
#include <limits.h>
-#include "afs_assert.h"
#include "afsutil.h"
#include "fileutil.h"
+#include <afs/opr.h>
+
#ifdef AFS_PTHREAD_ENV
#include <pthread.h>
static pthread_once_t dirInit_once = PTHREAD_ONCE_INIT;
#include <ctype.h>
+#include <afs/opr.h>
#include "afsutil.h"
#include "ktime.h"
#include <rx/rx.h>
#include <afs/dirpath.h>
-#include "afs_assert.h"
#include "afsutil.h"
#define AFS_IPINVALID 0xffffffff /* invalid IP address */
#ifdef AFS_PTHREAD_ENV
#include <pthread.h>
-#include <afs/afs_assert.h>
+#include <afs/opr.h>
typedef struct {
pthread_mutex_t mut;
extern int pthread_recursive_mutex_unlock(pthread_recursive_mutex_p);
#define LOCK_GLOBAL_MUTEX \
- osi_Assert(pthread_recursive_mutex_lock(&grmutex)==0)
+ opr_Assert(pthread_recursive_mutex_lock(&grmutex)==0)
#define UNLOCK_GLOBAL_MUTEX \
- osi_Assert(pthread_recursive_mutex_unlock(&grmutex)==0)
+ opr_Assert(pthread_recursive_mutex_unlock(&grmutex)==0)
#else
_SETABRT \
_SETFPE \
b = (AFS_SET_SIGMASK(SIG_BLOCK, &i_tset, &i_oset) == 0); \
- assert(b); \
+ opr_Assert(b); \
} while (0)
#define AFS_SIGSET_RESTORE() \
do { \
int b = (AFS_SET_SIGMASK(SIG_SETMASK, &i_oset, NULL) == 0); \
- assert(b); \
+ opr_Assert(b); \
} while (0)
#endif /* AFS_NT40_ENV */
#include <lwp.h>
#if defined(AFS_PTHREAD_ENV)
-#include <afs/afs_assert.h>
/* can't include rx when we are libutil; it's too early */
#include <rx/rx.h>
#include <pthread.h>
#include <afs/procmgmt.h> /* Must be before roken.h */
#include <roken.h>
+#include <afs/opr.h>
-#include <assert.h>
#include <pthread.h>
#include "pthread_nosigs.h"
AFS_SIGSET_DECL;
AFS_SIGSET_CLEAR();
rc = pthread_create(&softsig_tid, NULL, &softsig_thread, NULL);
- assert(0 == rc);
+ opr_Assert(0 == rc);
AFS_SIGSET_RESTORE();
signal (SIGUSR1, softsig_usr1);
}
#include <afs/stds.h>
#include <roken.h>
-
#include <ctype.h>
+#include <assert.h>
#include <afs/afs_consts.h>
#include <afs/afs_args.h>
#include <rx/xdr.h>
#include <afs/nfs.h>
-#include <afs/afs_assert.h>
#include <lwp.h>
#include <lock.h>
#include <afs/afsint.h>
#include <sys/file.h>
#endif
-#include <afs/afs_assert.h>
-
#include <afs/nfs.h> /* yuck. This is an abomination. */
#include <lwp.h>
#include <rx/rx.h>
#endif
#include <rx/xdr.h>
-#include <afs/afs_assert.h>
#include <lwp.h>
#include <lock.h>
#include <afs/afsint.h>
* precedence is host_listlock_mutex, host->mutex, host_glock_mutex.
*/
#include <rx/rx_globals.h>
-#include <afs/afs_assert.h>
#include <pthread.h>
extern pthread_mutex_t host_glock_mutex;
#define H_LOCK MUTEX_ENTER(&host_glock_mutex);
#endif
#include <afs/nfs.h>
-#include <afs/afs_assert.h>
#include <lwp.h>
#include <lock.h>
#include <afs/afsint.h>
#include <rx/xdr.h>
#include <afs/nfs.h>
-#include <afs/afs_assert.h>
#include <lwp.h>
#include <lock.h>
#include <afs/cmd.h>
* HostCheck, Signal, min 2 for RXSTATS */
#ifdef AFS_PTHREAD_ENV
#include <pthread.h>
-#include <afs/afs_assert.h>
extern pthread_mutex_t fileproc_glock_mutex;
#define FS_LOCK MUTEX_ENTER(&fileproc_glock_mutex);
#define FS_UNLOCK MUTEX_EXIT(&fileproc_glock_mutex);
#include <winbase.h>
#endif
-#include <afs/afs_assert.h>
#include <rx/xdr.h>
#include <afs/afsint.h>
#include <afs/afssyscalls.h>
#include <roken.h>
#include <afs/opr.h>
-#include <afs/afs_assert.h>
#include <rx/xdr.h>
#include <afs/afsint.h>
#include <afs/errors.h>
#include <roken.h>
-#include <afs/afs_assert.h>
#include <rx/xdr.h>
#include <afs/afsint.h>
#include <afs/errors.h>
#include <rx/xdr.h>
#include <afs/afsint.h>
-#include <afs/afs_assert.h>
#ifndef AFS_NT40_ENV
#include <afs/osi_inode.h>
#include "nfs.h"
#include "ihandle.h"
#include "viceinode.h"
-#include "afs/afs_assert.h"
#ifdef AFS_PTHREAD_ENV
pthread_once_t ih_glock_once = PTHREAD_ONCE_INIT;
#include <direct.h>
#endif
-#include <afs/afs_assert.h>
#include <lock.h>
#include <afs/afsutil.h>
#include <lwp.h>
#include "volume.h"
#include "viceinode.h"
#include <dirent.h>
-#include <afs/afs_assert.h>
#include <afs/errmap_nt.h>
#define BASEFILEATTRIBUTE FILE_ATTRIBUTE_NORMAL
#include <rx/xdr.h>
#include <afs/afsint.h>
-#include <afs/afs_assert.h>
#include <afs/afsutil.h>
#include "vnode.h"
#include "volume.h"
#include "partition.h"
-#include <afs/afs_assert.h>
#if defined(AFS_HPUX_ENV)
#include <sys/types.h>
#include <sys/file.h>
#endif
-#include <afs/afs_assert.h>
#include <afs/afsutil.h>
#include <rx/xdr.h>
#include <rx/xdr.h>
#include <afs/afsint.h>
-#include <afs/afs_assert.h>
#if !defined(AFS_SGI_ENV) && !defined(AFS_NT40_ENV)
#if defined(AFS_VFSINCL_ENV)
#include <rx/xdr.h>
#include <afs/afsint.h>
-#include <afs/afs_assert.h>
#if !defined(AFS_SGI_ENV) && !defined(AFS_NT40_ENV)
#if defined(AFS_VFSINCL_ENV)
#include <sys/vnode.h>
#include <winsock2.h>
#endif
-#include <afs/afs_assert.h>
#include <rx/xdr.h>
#include <afs/afsint.h>
#include "nfs.h"
#ifdef AFS_DEMAND_ATTACH_FS
-#include <afs/afs_assert.h>
-
#include <lock.h>
#include <afs/afsutil.h>
#include <lwp.h>
#ifdef AFS_DEMAND_ATTACH_FS
-#include <afs/afs_assert.h>
#include <lock.h>
#include <afs/afsutil.h>
#include <lwp.h>
#include <sys/file.h>
#endif
-#include <afs/afs_assert.h>
-
#include <rx/xdr.h>
#include "rx/rx_queue.h"
#include <afs/afsint.h>
#endif
#include <rx/xdr.h>
#include <afs/afsint.h>
-#include <afs/afs_assert.h>
#if !defined(AFS_SGI_ENV) && !defined(AFS_NT40_ENV)
#if defined(AFS_VFSINCL_ENV)
#include <sys/vnode.h>
#include <afs/param.h>
#include <roken.h>
+#include <afs/opr.h>
#include <ctype.h>
#include <stddef.h>
#include "partition.h"
#include "volume_inline.h"
#include "common.h"
-#include "afs/afs_assert.h"
#include "vutils.h"
#include <afs/dir.h>
#endif
#ifdef AFS_PTHREAD_ENV
+
+#include <afs/opr_assert.h>
+
/**
* @param[in] cv cond var
* @param[in] ts deadline, or NULL to wait forever
#include <sys/lockf.h>
#endif
-#include <afs/afs_assert.h>
-
#include <rx/xdr.h>
#include <afs/afsint.h>
#include "nfs.h"
#include <ctype.h>
-#include <afs/afs_assert.h>
#include <rx/xdr.h>
#include <rx/rx.h>
#include <afs/afsint.h>
#include <rx/rx.h>
#include <afs/afsint.h>
#include <afs/nfs.h>
-#include <afs/afs_assert.h>
#include <afs/dir.h>
#include <afs/ihandle.h>
#endif
#if defined(AFS_NAMEI_ENV) && !defined(AFS_NT40_ENV)
-#include <afs/afs_assert.h>
#include <afs/dir.h>
#include <rx/xdr.h>
#include <afs/afsint.h>
#include <rx/xdr.h>
#include <afs/afsint.h>
-#include <afs/afs_assert.h>
#include <afs/prs_fs.h>
#include <afs/nfs.h>
#include <lwp.h>
#include <rx/rx.h>
#include <rx/rxkad.h>
#include <afs/afsint.h>
-#include <afs/afs_assert.h>
#include <afs/prs_fs.h>
#include <afs/nfs.h>
#include <lwp.h>
#ifndef _VOLSER_
#define _VOLSER_ 1
-#include <afs/afs_assert.h>
#ifdef AFS_PTHREAD_ENV
#include <pthread.h>
#endif
#endif
#include <afs/afsint.h>
-#include <afs/afs_assert.h>
#include <afs/prs_fs.h>
#include <afs/nfs.h>
#include <lwp.h>