merge ntops and namei

[openafs.git] / src / vol / nuke.c

diff --git a/src/vol/nuke.c b/src/vol/nuke.c
index b937f54..c5e5a89 100644 (file)
--- a/src/vol/nuke.c
+++ b/src/vol/nuke.c
@@ -1,7 +1,7 @@
 /*
  * 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
@@ -14,11 +14,7 @@
 #include <rx/xdr.h>
 #include <afs/afsint.h>
 #include <stdio.h>
-#ifdef AFS_PTHREAD_ENV
-#include <assert.h>
-#else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
-#endif /* AFS_PTHREAD_ENV */
+#include <afs/afs_assert.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -32,7 +28,7 @@
 #endif
 
 #include <afs/afsutil.h>
-    
+
 #include "nfs.h"
 #include "lwp.h"
 #include "lock.h"
@@ -45,6 +41,7 @@
 #include "salvage.h"
 #include "daemon_com.h"
 #include "fssync.h"
+#include "common.h"
 
 #ifdef O_LARGEFILE
 #define afs_stat       stat64
@@ -52,9 +49,6 @@
 #define afs_stat       stat
 #endif /* !O_LARGEFILE */
 
-/*@printflike@*/ extern void Log(const char *format, ...);
-
-
 struct Lock localLock;
 
 #define MAXATONCE      100
@@ -78,7 +72,7 @@ NukeProc(struct ViceInodeInfo *ainfo, afs_uint32 avolid, void *arock)
 {
     struct ilist **allInodes = (struct ilist **)arock;
     struct ilist *ti;
-    register afs_int32 i;
+    afs_int32 i;
 
 #ifndef AFS_PTHREAD_ENV
     IOMGR_Poll();              /* poll so we don't kill the RPC connection */
@@ -117,18 +111,15 @@ nuke(char *aname, afs_int32 avolid)
     /* first process the partition containing this junk */
     struct afs_stat tstat;
     struct ilist *ti, *ni, *li=NULL;
-    register afs_int32 code;
+    afs_int32 code;
     int i, forceSal;
     char wpath[100];
     char *lastDevComp;
     struct DiskPartition64 *dp;
 #ifdef AFS_NAMEI_ENV
-#ifdef AFS_NT40_ENV
-    char path[MAX_PATH];
-#else
     char *path;
+
     namei_t ufs_name;
-#endif
 #endif /* AFS_NAMEI_ENV */
 #ifndef AFS_NAMEI_ENV
     char devName[64];
@@ -192,15 +183,14 @@ nuke(char *aname, afs_int32 avolid)
 #ifdef AFS_NT40_ENV
                IH_INIT(fileH, (int)(*lastDevComp - 'A'), avolid,
                        ti->inode[i]);
-               nt_HandleToName(path, fileH);
 #else
                IH_INIT(fileH, (int)volutil_GetPartitionID(aname), avolid,
                        ti->inode[i]);
+#endif /* AFS_NT40_ENV */
                namei_HandleToName(&ufs_name, fileH);
                path = ufs_name.n_path;
-#endif /* AFS_NT40_ENV */
                IH_RELEASE(fileH);
-               if (unlink(path) < 0) {
+               if (OS_UNLINK(path) < 0) {
                    Log("Nuke: Failed to remove %s\n", path);
                }
 #else /* AFS_NAMEI_ENV */