DEVEL15-windows-ifs-20060718

enable the afsifs code to build again

(cherry picked from commit 66db2c9bec2b6a38aab49eb31a992701930bd055)

diff --git a/src/WINNT/afsd/afsd_service.c b/src/WINNT/afsd/afsd_service.c
index 2f6e3d7c9ce4685c0e04dec1633153420e41f6be..1e1daece6da8e6f6434f132f0474cafae45d83a4 100644 (file)
--- a/src/WINNT/afsd/afsd_service.c
+++ b/src/WINNT/afsd/afsd_service.c
@@ -59,6 +59,10 @@ int powerEventsRegistered = 0;
  */
 static void afsd_notifier(char *msgp, char *filep, long line)
 {
+#ifdef AFSIFS
+    int i;
+#endif
+
     if (filep)
        LogEvent(EVENTLOG_ERROR_TYPE, MSG_SERVICE_ERROR_STOP_WITH_MSG_AND_LOCATION, 
                  filep, line, msgp);
@@ -1033,6 +1037,9 @@ afsd_Main(DWORD argc, LPTSTR *argv)
 #endif /* JUMP */
     HMODULE hHookDll;
     HMODULE hAdvApi32;
+#ifdef AFSIFS
+    int cnt;
+#endif
 
 #ifdef _DEBUG
     _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF /*| _CRTDBG_CHECK_ALWAYS_DF*/ | 

diff --git a/src/sys/pioctl_nt.c b/src/sys/pioctl_nt.c
index f379449d191d56ecb27a11b3932da8e352c4a02d..9388a44b142d15042c798064d3e27ce66c7ba306 100644 (file)
--- a/src/sys/pioctl_nt.c
+++ b/src/sys/pioctl_nt.c
@@ -329,8 +329,10 @@ GetLSAPrincipalName(char * szUser, DWORD *dwSize)
 static long
 GetIoctlHandle(char *fileNamep, HANDLE * handlep)
 {
+#ifndef AFSIFS
     char *drivep;
     char netbiosName[MAX_NB_NAME_LENGTH];
+#endif
     char tbuffer[256]="";
     HANDLE fh;
     HKEY hk;
@@ -637,6 +639,9 @@ Transceive(HANDLE handle, fs_ioctlRequest_t * reqp)
     long rcount;
     long ioCount;
     DWORD gle;
+#ifdef AFSIFS
+    char *data;
+#endif
 
     rcount = (long)(reqp->mp - reqp->data);
     if (rcount <= 0) {
@@ -763,7 +768,7 @@ fs_GetFullPath(char *pathp, char *outPathp, long outSize)
     if (rootDir == INVALID_HANDLE_VALUE)
         return CM_ERROR_NOSUCHPATH;
 
-    wpath = tpath;
+    wpath = (wchar_t *)tpath;
     length = 0;
     if (!DeviceIoControl(rootDir, IOCTL_AFSRDR_GET_PATH, NULL, 0, wpath, 1000, &length, NULL))
     {