From 960ac913a43a2fba408c08518d7114fe6b633ab5 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Thu, 19 Jul 2007 16:55:44 +0000
Subject: [PATCH] windows-afs-svrmgr-20070719

uninitialized variable removal
---
 src/WINNT/afsclass/afsclassfn.cpp | 19 +++++++++----------
 src/WINNT/afsclass/c_svr.cpp      |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/WINNT/afsclass/afsclassfn.cpp b/src/WINNT/afsclass/afsclassfn.cpp
index 207e87c..4b90a04 100644
--- a/src/WINNT/afsclass/afsclassfn.cpp
+++ b/src/WINNT/afsclass/afsclassfn.cpp
@@ -54,9 +54,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
@@ -390,8 +390,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;
@@ -492,9 +492,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
@@ -606,9 +606,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
@@ -1154,7 +1154,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 1cb54d5..2cad619 100644
--- a/src/WINNT/afsclass/c_svr.cpp
+++ b/src/WINNT/afsclass/c_svr.cpp
@@ -786,8 +786,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 ];
 
-- 
1.9.4