merge ntops and namei

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

diff --git a/src/vol/nuke.c b/src/vol/nuke.c
index 151f0bd..c5e5a89 100644 (file)
--- a/src/vol/nuke.c
+++ b/src/vol/nuke.c
@@ -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/afs_assert.h>
-#endif /* AFS_PTHREAD_ENV */
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -121,12 +117,9 @@ nuke(char *aname, afs_int32 avolid)
     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];
@@ -190,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 */