syntax-err-20060404

Fix syntax error (missing braces)
Fix include file ordering
Don't declare *tmpdir extern, we're initializing it here (even though
  there's no reason to)
Fix OnlyOneVolume args to match proto

diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index 1a3a9bda3d69d1c94af6f64b6e299b719cf70b54..2183a6cdbd58bcd9fb0e7ed39c5fd5f6202c7fce 100644 (file)
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -89,6 +89,13 @@ Vnodes with 0 inode pointers in RW volumes are now deleted.
 RCSID
     ("$Header$");
 
+#ifndef AFS_NT40_ENV
+#include <sys/param.h>
+#include <sys/file.h>
+#ifndef ITIMER_REAL
+#include <sys/time.h>
+#endif /* ITIMER_REAL */
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -99,12 +106,6 @@ RCSID
 #ifdef AFS_NT40_ENV
 #include <io.h>
 #include <WINNT/afsevent.h>
-#else
-#include <sys/param.h>
-#include <sys/file.h>
-#ifndef ITIMER_REAL
-#include <sys/time.h>
-#endif /* ITIMER_REAL */
 #endif
 #if    defined(AFS_AIX_ENV) || defined(AFS_SUN4_ENV)
 #define WCOREDUMP(x)   (x & 0200)
@@ -284,7 +285,7 @@ struct VolumeSummary *volumeSummaryp;       /* Holds all the volumes in a part */
 int nVolumes;                  /* Number of volumes (read-write and read-only)
                                 * in volume summary */
 
-extern char * tmpdir = 0;
+char *tmpdir = NULL;
 
 
 
@@ -1000,7 +1001,7 @@ CountVolumeInodes(register struct ViceInodeInfo *ip, int maxInodes,
 }
 
 int
-OnlyOneVolume(struct ViceInodeInfo *inodeinfo, VolumeId singleVolumeNumber, void *rock)
+OnlyOneVolume(struct ViceInodeInfo *inodeinfo, int singleVolumeNumber, void *rock)
 {
     if (inodeinfo->u.vnode.vnodeNumber == INODESPECIAL)
        return (inodeinfo->u.special.parentId == singleVolumeNumber);
@@ -2168,9 +2169,10 @@ SalvageIndex(Inode ino, VnodeClass class, int RW,
                                Log("Vnode %d (unique %u): corresponding inode %s is missing; vnode deleted, vnode mod time=%s", vnodeNumber, vnode->uniquifier, PrintInode(NULL, VNDISK_GET_INO(vnode)), ctime(&serverModifyTime));
                            }
                        } else {
-                           if (!Showmode)
+                           if (!Showmode) {
                                time_t serverModifyTime = vnode->serverModifyTime;
                                Log("Vnode %d (unique %u): bad directory vnode (no inode number listed); vnode deleted, vnode mod time=%s", vnodeNumber, vnode->uniquifier, ctime(&serverModifyTime));
+                           }
                        }
                        memset(vnode, 0, vcp->diskSize);
                        vnodeChanged = 1;