From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 22 Oct 2008 02:25:25 +0000 (+0000)
Subject: windows-reformatting-20081021
X-Git-Tag: openafs-devel-1_5_61~731
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=f64ecbf721dbc115103684a3d71a095854607812

windows-reformatting-20081021

LICENSE MIT

reformat some of the recent changes

cast away warnings on 64-bit windows
---

diff --git a/src/WINNT/afsd/cm_ioctl.c b/src/WINNT/afsd/cm_ioctl.c
index c24ce06..08eb06b 100644
--- a/src/WINNT/afsd/cm_ioctl.c
+++ b/src/WINNT/afsd/cm_ioctl.c
@@ -460,9 +460,9 @@ cm_IoctlGetFileCellName(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scach
             if (cellname == NULL) {
                 code = CM_ERROR_NOSUCHCELL;
             } else {
-            cm_UnparseIoctlString(ioctlp, NULL, cellname, -1);
-            free(cellname);
-            code = 0;
+                cm_UnparseIoctlString(ioctlp, NULL, cellname, -1);
+                free(cellname);
+                code = 0;
             }
         } else
             code = CM_ERROR_NOSUCHCELL;
@@ -1359,8 +1359,8 @@ cm_IoctlGetCell(struct cm_ioctl *ioctlp, struct cm_user *userp)
 
         cellnamep = cm_FsStringToClientStringAlloc(tcellp->name, -1, NULL);
         if (cellnamep) {
-        cm_UnparseIoctlString(ioctlp, NULL, cellnamep, -1);
-        free(cellnamep);
+            cm_UnparseIoctlString(ioctlp, NULL, cellnamep, -1);
+            free(cellnamep);
         } else {
             tcellp = NULL;
         }
@@ -1461,9 +1461,9 @@ cm_IoctlGetWsCell(cm_ioctl_t *ioctlp, cm_user_t *userp)
         clientchar_t * cellnamep = cm_FsStringToClientStringAlloc(cm_data.rootCellp->name, -1, NULL);
         /* return the default cellname to the caller */
         if (cellnamep) {
-        cm_UnparseIoctlString(ioctlp, NULL, cellnamep, -1);
-        free(cellnamep);
-    } else {
+            cm_UnparseIoctlString(ioctlp, NULL, cellnamep, -1);
+            free(cellnamep);
+        } else {
             code = CM_ERROR_NOSUCHCELL;
         }
     } else {
diff --git a/src/WINNT/afsd/cm_nls.c b/src/WINNT/afsd/cm_nls.c
index 63e56e4..02903cf 100644
--- a/src/WINNT/afsd/cm_nls.c
+++ b/src/WINNT/afsd/cm_nls.c
@@ -157,7 +157,7 @@ NormalizeUtf16String(const wchar_t * src, int cch_src, wchar_t * ext_dest, int *
 #endif
 
     if (cch_src == -1)
-        cch_src = wcslen(src) + 1;
+        cch_src = (int)wcslen(src) + 1;
 
     if ((pIsNormalizedString && (*pIsNormalizedString)(AFS_NORM_FORM, src, cch_src)) ||
         (!pNormalizeString)) {
@@ -381,7 +381,7 @@ int cm_Utf16ToUtf16(const cm_unichar_t * src, int cch_src,
 
     if (cch_src == -1) {
         StringCchCopyW(dest, cch_dest, src);
-        return wcslen(dest) + 1;
+        return (int)wcslen(dest) + 1;
     } else {
         int cch_conv = min(cch_src, cch_dest);
         memcpy(dest, src, cch_conv * sizeof(cm_unichar_t));
@@ -418,7 +418,7 @@ long cm_NormalizeUtf16StringToUtf8(const wchar_t * src, int cch_src,
         if (FAILED(StringCchLengthW(src, NLSMAXCCH, &cch)))
             return E2BIG;
 
-        cch_src = cch+1;
+        cch_src = (int)cch+1;
     }
 
     {
@@ -650,7 +650,7 @@ long cm_NormalizeUtf8StringToUtf16(const char * src, int cch_src,
     }
 
     if (cch_src == -1) {
-        cch_src = strlen(src) + 1;
+        cch_src = (int)strlen(src) + 1;
     }
 
     cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src,
@@ -745,7 +745,7 @@ cm_normchar_t *cm_NormalizeUtf8StringToUtf16Alloc(const cm_utf8char_t * src, int
     }
 
     if (cch_src == -1) {
-        cch_src = strlen(src) + 1;
+        cch_src = (int)strlen(src) + 1;
     }
 
     cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src,
@@ -826,7 +826,7 @@ int cm_Utf8ToUtf16(const cm_utf8char_t * src, int cch_src,
         cm_InitNormalization();
 
     if (cch_src == -1) {
-        cch_src = strlen(src) + 1;
+        cch_src = (int)strlen(src) + 1;
     }
 
     cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src,
@@ -897,7 +897,7 @@ cm_unichar_t  * cm_Utf8ToUtf16Alloc(const cm_utf8char_t * src, int cch_src, int
     }
 
     if (cch_src == -1) {
-        cch_src = strlen(src) + 1;
+        cch_src = (int)strlen(src) + 1;
     }
 
     cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src,
@@ -1024,7 +1024,7 @@ long cm_NormalizeUtf8String(const char * src, int cch_src,
     }
 
     if (cch_src == -1) {
-        cch_src = strlen(src) + 1;
+        cch_src = (int)strlen(src) + 1;
     }
 
     cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src,
@@ -1175,7 +1175,7 @@ int cm_strnicmp_utf16(const cm_unichar_t * str1, const cm_unichar_t * str2, int
     if (FAILED(StringCchLengthW(str2, len, &cch2)))
         cch2 = len;
 
-    rv = CompareStringW(nls_lcid, NORM_IGNORECASE, str1, cch1, str2, cch2);
+    rv = CompareStringW(nls_lcid, NORM_IGNORECASE, str1, (int)cch1, str2, (int)cch2);
     if (rv > 0)
         return (rv - 2);
     else {
@@ -1222,7 +1222,7 @@ cm_unichar_t *cm_strlwr_utf16(cm_unichar_t * str)
     if (!nls_init)
         cm_InitNormalization();
 
-    len = wcslen(str) + 1;
+    len = (int)wcslen(str) + 1;
     rv = LCMapStringW(nls_lcid, LCMAP_LOWERCASE, str, len, str, len);
 #ifdef DEBUG
     if (rv == 0) {
@@ -1241,7 +1241,7 @@ cm_unichar_t *cm_strupr_utf16(cm_unichar_t * str)
     if (!nls_init)
         cm_InitNormalization();
 
-    len = wcslen(str) + 1;
+    len = (int)wcslen(str) + 1;
     rv = LCMapStringW(nls_lcid, LCMAP_UPPERCASE, str, len, str, len);
 #ifdef DEBUG
     if (rv == 0) {
@@ -1333,7 +1333,7 @@ char * strupr_utf8(char * str, size_t cbstr)
 
     len = LCMapStringW(nls_lcid, LCMAP_UPPERCASE, wstr, len, wstrd, NLSMAXCCH);
 
-    len = WideCharToMultiByte(CP_UTF8, 0, wstrd, -1, str, cbstr, NULL, FALSE);
+    len = WideCharToMultiByte(CP_UTF8, 0, wstrd, -1, str, (int)cbstr, NULL, FALSE);
 
     return str;
 }
diff --git a/src/WINNT/afsd/cm_utils.c b/src/WINNT/afsd/cm_utils.c
index f8fbab5..c3abe84 100644
--- a/src/WINNT/afsd/cm_utils.c
+++ b/src/WINNT/afsd/cm_utils.c
@@ -399,7 +399,10 @@ int cm_Is8Dot3(clientchar_t *namep)
     int sawDot = 0;
     clientchar_t tc;
     int charCount = 0;
-        
+    
+    if (namep == NULL || !namep[0])
+        return 0;
+
     /*
      * can't have a leading dot;
      * special case for . and ..
diff --git a/src/WINNT/afsd/cm_vnodeops.c b/src/WINNT/afsd/cm_vnodeops.c
index e9d8d54..2ab6c5b 100644
--- a/src/WINNT/afsd/cm_vnodeops.c
+++ b/src/WINNT/afsd/cm_vnodeops.c
@@ -1248,7 +1248,7 @@ long cm_LookupInternal(cm_scache_t *dscp, clientchar_t *cnamep, long flags, cm_u
                 free(nnamep);
             nnamep = cm_ClientStringToNormStringAlloc(cnamep, -1, NULL);
             if (nnamep)
-            cm_dnlcEnter(dscp, nnamep, tscp);
+                cm_dnlcEnter(dscp, nnamep, tscp);
         }
         lock_ReleaseRead(&dscp->rw);
     }
diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c
index d1d4ac9..7fbb59e 100644
--- a/src/WINNT/afsd/smb.c
+++ b/src/WINNT/afsd/smb.c
@@ -1774,7 +1774,8 @@ long smb_FindShareProc(cm_scache_t *scp, cm_dirEntry_t *dep, void *rockp,
             matchType = SMB_FINDSHARE_EXACT_MATCH;
         else
             matchType = SMB_FINDSHARE_PARTIAL_MATCH;
-        if(vrock->match) free(vrock->match);
+        if(vrock->match) 
+            free(vrock->match);
         vrock->match = cm_FsStringToClientStringAlloc(dep->name, -1, NULL);
         vrock->matchType = matchType;
 
@@ -4839,7 +4840,8 @@ long smb_ReceiveCoreSearchDir(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *ou
         /* Compute 8.3 name if necessary */
         actualName = cm_FsStringToClientStringAlloc(dep->name, -1, NULL);
         if (dep->fid.vnode != 0 && !cm_Is8Dot3(actualName)) {
-            free(actualName);
+            if (actualName)
+                free(actualName);
             cm_Gen8Dot3NameInt(dep->name, &dep->fid, shortName, &shortNameEnd);
             actualName = shortName;
             free_actualName = 0;