ubik-warning-cleanup-20011005

[openafs.git] / src / ubik / ubik.c

diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c
index 7b1238d..12772ca 100644 (file)
--- a/src/ubik/ubik.c
+++ b/src/ubik/ubik.c
@@ -7,7 +7,11 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+
+RCSID("$Header$");
+
 #include <sys/types.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
@@ -18,6 +22,13 @@
 #endif
 #include <time.h>
 #include <lock.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <afs/cellconfig.h>
@@ -212,14 +223,14 @@ int ubik_ServerInitCommon(myHost, myPort, info, clones, serverList, pathName, db
     extern void rx_ServerProc();
     extern int rx_stackSize;
 
-    initialize_u_error_table();
+    initialize_U_error_table();
 
     tdb = (struct ubik_dbase *) malloc(sizeof(struct ubik_dbase));
     tdb->pathName = (char *) malloc(strlen(pathName)+1);
     strcpy(tdb->pathName, pathName);
     tdb->activeTrans = (struct ubik_trans *) 0;
-    bzero(&tdb->version, sizeof(struct ubik_version));
-    bzero(&tdb->cachedVersion, sizeof(struct ubik_version));
+    memset(&tdb->version, 0, sizeof(struct ubik_version));
+    memset(&tdb->cachedVersion, 0, sizeof(struct ubik_version));
     Lock_Init(&tdb->versionLock);
     tdb->flags = 0;
     tdb->read = uphys_read;
@@ -395,7 +406,7 @@ int ubik_AbortTrans(transPtr)
     
     dbase = transPtr->dbase;
     DBHOLD(dbase);
-    bzero(&dbase->cachedVersion, sizeof(struct ubik_version));
+    memset(&dbase->cachedVersion, 0, sizeof(struct ubik_version));
     /* see if we're still up-to-date */
     if (!urecovery_AllBetter(dbase, transPtr->flags & TRREADANY)) {
        udisk_abort(transPtr);
@@ -447,7 +458,7 @@ int ubik_EndTrans(transPtr)
 
     dbase = transPtr->dbase;
     DBHOLD(dbase);
-    bzero(&dbase->cachedVersion, sizeof(struct ubik_version));
+    memset(&dbase->cachedVersion, 0, sizeof(struct ubik_version));
 
     /* give up if no longer current */
     if (!urecovery_AllBetter(dbase, transPtr->flags & TRREADANY)) {
@@ -526,7 +537,7 @@ int ubik_EndTrans(transPtr)
   success:
     udisk_end(transPtr);
     /* update version on successful EndTrans */
-    bcopy(&dbase->version, &dbase->cachedVersion, sizeof(struct ubik_version));
+    memcpy(&dbase->cachedVersion, &dbase->version, sizeof(struct ubik_version));
     
     DBRELE(dbase);
     return 0;
@@ -663,9 +674,7 @@ int ubik_Write(transPtr, buffer, length)
     iovec[transPtr->iovec_info.iovec_wrt_len].position = transPtr->seekPos;
     iovec[transPtr->iovec_info.iovec_wrt_len].length   = length;
     
-    bcopy(buffer, 
-         &transPtr->iovec_data.iovec_buf_val[transPtr->iovec_data.iovec_buf_len],
-         length);
+    memcpy(&transPtr->iovec_data.iovec_buf_val[transPtr->iovec_data.iovec_buf_len], buffer, length);
 
     transPtr->iovec_info.iovec_wrt_len++;
     transPtr->iovec_data.iovec_buf_len += length;