From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Thu, 19 Jul 2007 16:56:53 +0000 (+0000)
Subject: DEVEL15-windows-afs-svrmgr-20070719
X-Git-Tag: openafs-devel-1_5_22~32
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f48ebc90c00fb61c9f8e8e1d1c4a11d66a38a09a;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-afs-svrmgr-20070719


uninitialized variable removal


(cherry picked from commit 960ac913a43a2fba408c08518d7114fe6b633ab5)
---

diff --git a/src/WINNT/afsclass/afsclassfn.cpp b/src/WINNT/afsclass/afsclassfn.cpp
index b7429acc3..1477a8e7f 100644
--- a/src/WINNT/afsclass/afsclassfn.cpp
+++ b/src/WINNT/afsclass/afsclassfn.cpp
@@ -51,9 +51,9 @@ BOOL AfsClass_GetServerLogFile (LPIDENT lpiServer, LPTSTR pszLocal, LPTSTR pszRe
    AfsClass_Enter();
    NOTIFYCALLBACK::SendNotificationToAll (evtGetServerLogFileBegin, lpiServer, pszRemote, 0);
 
-   PVOID hCell;
-   PVOID hBOS;
-   LPSERVER lpServer;
+   PVOID hCell = NULL;
+   PVOID hBOS = NULL;
+   LPSERVER lpServer = NULL;
    if ((lpServer = lpiServer->OpenServer (&status)) == NULL)
       rc = FALSE;
    else
@@ -387,8 +387,8 @@ BOOL AfsClass_RestartService (LPIDENT lpiRestart, ULONG *pStatus)
    AfsClass_Enter();
    NOTIFYCALLBACK::SendNotificationToAll (evtRestartServiceBegin, lpiRestart);
 
-   PVOID hCell;
-   PVOID hBOS;
+   PVOID hCell = NULL;
+   PVOID hBOS = NULL;
    LPSERVER lpServer;
    if ((lpServer = lpiRestart->OpenServer (&status)) == NULL)
       rc = FALSE;
@@ -489,9 +489,9 @@ LPIDENT AfsClass_CreateFileset (LPIDENT lpiAggregate, LPTSTR pszFileset, ULONG c
 
    // Obtain hCell and hVOS
    //
-   PVOID hCell;
+   PVOID hCell = NULL;
    PVOID hVOS = NULL;
-   LPSERVER lpServer;
+   LPSERVER lpServer = NULL;
    if ((lpServer = lpiAggregate->OpenServer (&status)) == NULL)
       rc = FALSE;
    else
@@ -603,9 +603,9 @@ BOOL AfsClass_DeleteFileset (LPIDENT lpiFileset, BOOL fVLDB, BOOL fServer, ULONG
 
    // Obtain hCell and hVOS
    //
-   PVOID hCell;
+   PVOID hCell = NULL;
    PVOID hVOS = NULL;
-   LPSERVER lpServer;
+   LPSERVER lpServer = NULL;
    if ((lpServer = lpiFileset->OpenServer (&status)) == NULL)
       rc = FALSE;
    else
@@ -1151,7 +1151,6 @@ BOOL AfsClass_ChangeAddress (LPIDENT lpiServer, LPSOCKADDR_IN pAddrOld, LPSOCKAD
          lpServer->Close();
          }
 
-      LPCELL lpCell;
       if ((lpCell = lpiServer->OpenCell (&status)) == NULL)
          rc = FALSE;
       else
diff --git a/src/WINNT/afsclass/c_svr.cpp b/src/WINNT/afsclass/c_svr.cpp
index f260c8f6a..f141f6509 100644
--- a/src/WINNT/afsclass/c_svr.cpp
+++ b/src/WINNT/afsclass/c_svr.cpp
@@ -783,8 +783,8 @@ DWORD WINAPI SERVER::CanTalkToServer_ThreadProc (PVOID lp)
    // the lpServer pointer won't have been freed.)
    // 
    PVOID hCell;
-   PVOID hBOS;
-   PVOID hVOS;
+   PVOID hBOS = NULL;
+   PVOID hVOS = NULL;
 
    TCHAR szServer[ cchNAME ];