fix-joe-beuhler-patches-20031124

minor fixes to Joe Beuhler's NT patches for non-NT

diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c
index ed4d44b..892e834 100644 (file)
--- a/src/butc/tcmain.c
+++ b/src/butc/tcmain.c
@@ -975,9 +975,10 @@ WorkerBee(as, arock)
     if (centralLogFile) {
        struct stat sbuf;
        afs_int32 statcode;
-#ifdef AFS_NT40_ENV
+#ifndef AFS_NT40_ENV
        char path[AFSDIR_PATH_MAX];
 #endif
+
        statcode = stat(centralLogFile, &sbuf);
        centralLogIO = fopen(centralLogFile, "a");
        if (!centralLogIO) {

diff --git a/src/kauth/admin_tools.c b/src/kauth/admin_tools.c
index 263ed22..56e6ed3 100644 (file)
--- a/src/kauth/admin_tools.c
+++ b/src/kauth/admin_tools.c
@@ -1348,8 +1348,8 @@ MyBeforeProc(struct cmd_syndesc *as, char *arock)
            }
 #else
            /* No explicit name provided: use Unix uid. */
-           struct passwd pw = getpwuid(getuid());
-           if (pw == 0) {
+           struct passwd *pw = getpwuid(getuid());
+           if (pw == NULL) {
                printf("Can't figure out your name from your user id.\n");
                return KABADCMD;
            }

diff --git a/src/lwp/iomgr.c b/src/lwp/iomgr.c
index 8465588..9128930 100644 (file)
--- a/src/lwp/iomgr.c
+++ b/src/lwp/iomgr.c
@@ -292,7 +292,7 @@ static int FDSetCmp(int nfds, fd_set *fd_set1, fd_set *fd_set2)
  */
 static void FDSetSet(int nfds, fd_set *fd_set1, fd_set *fd_set2)
 {
-    unsigned int i;
+    unsigned int i, n;
 
     if (fd_set1 == (fd_set*)0 || fd_set2 == (fd_set*)0)
        return;
@@ -307,7 +307,7 @@ static void FDSetSet(int nfds, fd_set *fd_set1, fd_set *fd_set2)
     if (nfds == 0)
        return;
 
-    for (i=0,n = INTS_PER_FDS(nfds); i<n; i++) {
+    for (i = 0, n = INTS_PER_FDS(nfds); i < n; i++) {
        fd_set1->FDS_BITS[i] |= fd_set2->FDS_BITS[i];
     }
 #endif