windows-afs-svrmgr-20070719

[openafs.git] / src / WINNT / afsclass / afsclassfn.cpp

diff --git a/src/WINNT/afsclass/afsclassfn.cpp b/src/WINNT/afsclass/afsclassfn.cpp
index 736c922..4b90a04 100644 (file)
--- a/src/WINNT/afsclass/afsclassfn.cpp
+++ b/src/WINNT/afsclass/afsclassfn.cpp
@@ -7,6 +7,9 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
 extern "C" {
 #include <afs/param.h>
 #include <afs/stds.h>
@@ -51,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
@@ -82,11 +85,12 @@ BOOL AfsClass_GetServerLogFile (LPIDENT lpiServer, LPTSTR pszLocal, LPTSTR pszRe
             //
             for (LPTSTR psz = wp.wpBosLogGet.pszLogData; psz && *psz; )
                {
-               for (LPTSTR pszNext = psz; *pszNext && (*pszNext != TEXT('\r')) && (*pszNext != TEXT('\n')); ++pszNext)
+               LPTSTR pszNext;
+               for (pszNext = psz; *pszNext && (*pszNext != TEXT('\r')) && (*pszNext != TEXT('\n')); ++pszNext)
                   ;
                DWORD cbWrite;
                DWORD cbWrote;
-               if ((cbWrite = pszNext - psz) != 0)
+               if ((cbWrite = (DWORD)(pszNext - psz)) != 0)
                   WriteFile (fh, psz, cbWrite, &cbWrote, NULL);
                WriteFile (fh, TEXT("\r\n"), 2, &cbWrote, NULL);
                psz = (*pszNext == TEXT('\r')) ? (2+pszNext) : (*pszNext == TEXT('\n')) ? (1+pszNext) : NULL;
@@ -386,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;
@@ -398,7 +402,7 @@ BOOL AfsClass_RestartService (LPIDENT lpiRestart, ULONG *pStatus)
       lpServer->Close();
       }
 
-   BOOL fRestartAll;
+   BOOL fRestartAll = FALSE;
    if (!lpiRestart->fIsService())
       fRestartAll = TRUE;
 
@@ -488,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
@@ -602,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
@@ -1150,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
@@ -2495,7 +2498,8 @@ size_t AfsClass_AdminList_AddEntry (LPADMINLIST lpList, LPTSTR pszAdmin)
 
    if (lpList)
       {
-      for (size_t iEntry = 0; iEntry < lpList->cEntries; ++iEntry)
+      size_t iEntry;
+      for (iEntry = 0; iEntry < lpList->cEntries; ++iEntry)
          {
          if (!lpList->aEntries[ iEntry ].szAdmin[0])
             break;
@@ -3610,7 +3614,8 @@ size_t AfsClass_HostList_AddEntry (LPHOSTLIST lpList, LPTSTR pszHost)
 
    if (lpList)
       {
-      for (size_t iEntry = 0; iEntry < lpList->cEntries; ++iEntry)
+      size_t iEntry;
+      for (iEntry = 0; iEntry < lpList->cEntries; ++iEntry)
          {
          if (!lpList->aEntries[ iEntry ].szHost[0])
             break;
@@ -3741,7 +3746,7 @@ BOOL AfsClass_SetPtsProperties (LPIDENT lpiCell, LPPTSPROPERTIES pProperties, UL
 }
 
 
-LPIDENT AfsClass_CreateUser (LPIDENT lpiCell, LPTSTR pszUserName, LPTSTR pszInstance, LPTSTR pszPassword, int idUser, BOOL fCreateKAS, BOOL fCreatePTS, ULONG *pStatus)
+LPIDENT AfsClass_CreateUser (LPIDENT lpiCell, LPTSTR pszUserName, LPTSTR pszInstance, LPTSTR pszPassword, UINT_PTR idUser, BOOL fCreateKAS, BOOL fCreatePTS, ULONG *pStatus)
 {
    BOOL rc = TRUE;
    ULONG status;
@@ -3796,7 +3801,7 @@ LPIDENT AfsClass_CreateUser (LPIDENT lpiCell, LPTSTR pszUserName, LPTSTR pszInst
       WORKERPACKET wp;
       wp.wpPtsUserCreate.hCell = hCell;
       wp.wpPtsUserCreate.pszUser = szUserName;
-      wp.wpPtsUserCreate.idUser = idUser;
+      wp.wpPtsUserCreate.idUser = (int) idUser;
 
       AfsClass_Leave();