Changeset 26514 in vbox

Timestamp:

Feb 14, 2010 10:02:43 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

57685

Message:

remainder: tabs -> spaces.

Location:

trunk

Files:

• .scm-settings (modified) (1 diff)
• src/VBox/GuestHost/HGSMI/HGSMICommon.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedFolders/shflhandle.cpp (modified) (2 diffs)
• src/VBox/HostServices/SharedFolders/vbsf.cpp (modified) (2 diffs)

trunk/.scm-settings

@@ -74 +74 @@
 --filter-out-files "*/src/VBox/Devices/Audio/sys-queue.h"
 --filter-out-files "*/src/VBox/HostDrivers/VBoxUSB/os2/usbcalls.h"
+--filter-out-files "*/src/VBox/RDP/x11server/Init*.c"
 
 

trunk/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp

@@ -496 +496 @@
         else
         {
-                rc = VERR_INVALID_FUNCTION;
+            rc = VERR_INVALID_FUNCTION;
         }
     }
     else
     {
-        rc = VERR_INVALID_HANDLE;
+        rc = VERR_INVALID_HANDLE;
 //        LogRel(("HGSMI[%s]: ignored invalid guest buffer 0x%08X!!!\n", pIns->pszName, offBuffer));
     }

trunk/src/VBox/HostServices/SharedFolders/shflhandle.cpp

@@ -90 +90 @@
         if(pHandles[handle].pvUserData == 0)
         {
-            lastHandleIndex = handle;
-                break;
+            lastHandleIndex = handle;
+            break;
         }
     }
@@ -102 +102 @@
             if(pHandles[handle].pvUserData == 0)
             {
-                lastHandleIndex = handle;
-                    break;
+                lastHandleIndex = handle;
+                break;
             }
         }

trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

@@ -315 +315 @@
  * The question is simply whether the NFD normalization is actually applied on a (virtaul) file
  * system level in darwin, or just by the user mode application libs. */
-                SHFLSTRING *pPathParameter = pPath;
-                size_t cbPathLength;
-                CFMutableStringRef inStr = ::CFStringCreateMutable(NULL, 0);
-                uint16_t ucs2Length;
-                CFRange rangeCharacters;
-
-                // Is 8 times length enough for decomposed in worst case...?
-                cbPathLength = sizeof(SHFLSTRING) + pPathParameter->u16Length * 8 + 2;
-                pPath = (SHFLSTRING *)RTMemAllocZ (cbPathLength);
-                if (!pPath)
-                {
-                        rc = VERR_NO_MEMORY;
-                        Log(("RTMemAllocZ %x failed!!\n", cbPathLength));
-                        return rc;
-                }
-
-                ::CFStringAppendCharacters(inStr, (UniChar*)pPathParameter->String.ucs2, pPathParameter->u16Length / sizeof(pPathParameter->String.ucs2[0]));
-                ::CFStringNormalize(inStr, kCFStringNormalizationFormD);
-                ucs2Length = ::CFStringGetLength(inStr);
-
-                rangeCharacters.location = 0;
-                rangeCharacters.length = ucs2Length;
-                ::CFStringGetCharacters(inStr, rangeCharacters, pPath->String.ucs2);
-                pPath->String.ucs2[ucs2Length] = 0x0000; // NULL terminated
-                pPath->u16Length = ucs2Length * sizeof(pPath->String.ucs2[0]);
-                pPath->u16Size = pPath->u16Length + sizeof(pPath->String.ucs2[0]);
-
-                CFRelease(inStr);
+        SHFLSTRING *pPathParameter = pPath;
+        size_t cbPathLength;
+        CFMutableStringRef inStr = ::CFStringCreateMutable(NULL, 0);
+        uint16_t ucs2Length;
+        CFRange rangeCharacters;
+
+        // Is 8 times length enough for decomposed in worst case...?
+        cbPathLength = sizeof(SHFLSTRING) + pPathParameter->u16Length * 8 + 2;
+        pPath = (SHFLSTRING *)RTMemAllocZ (cbPathLength);
+        if (!pPath)
+        {
+            rc = VERR_NO_MEMORY;
+            Log(("RTMemAllocZ %x failed!!\n", cbPathLength));
+            return rc;
+        }
+
+        ::CFStringAppendCharacters(inStr, (UniChar*)pPathParameter->String.ucs2, pPathParameter->u16Length / sizeof(pPathParameter->String.ucs2[0]));
+        ::CFStringNormalize(inStr, kCFStringNormalizationFormD);
+        ucs2Length = ::CFStringGetLength(inStr);
+
+        rangeCharacters.location = 0;
+        rangeCharacters.length = ucs2Length;
+        ::CFStringGetCharacters(inStr, rangeCharacters, pPath->String.ucs2);
+        pPath->String.ucs2[ucs2Length] = 0x0000; // NULL terminated
+        pPath->u16Length = ucs2Length * sizeof(pPath->String.ucs2[0]);
+        pPath->u16Size = pPath->u16Length + sizeof(pPath->String.ucs2[0]);
+
+        CFRelease(inStr);
 #endif
         /* Client sends us UCS2, so convert it to UTF8. */
@@ -1597 +1597 @@
  * The question is simply whether the NFD normalization is actually applied on a (virtaul) file
  * system level in darwin, or just by the user mode application libs. */
-                        {
-                                // Convert to
-                                // Normalization Form C (composed Unicode). We need this because
-                                // Mac OS X file system uses NFD (Normalization Form D :decomposed Unicode)
-                                // while most other OS', server-side programs usually expect NFC.
-                                uint16_t ucs2Length;
-                                CFRange rangeCharacters;
-                                CFMutableStringRef inStr = ::CFStringCreateMutable(NULL, 0);
-
-                                ::CFStringAppendCharacters(inStr, (UniChar *)pwszString, RTUtf16Len (pwszString));
-                                ::CFStringNormalize(inStr, kCFStringNormalizationFormC);
-                                ucs2Length = ::CFStringGetLength(inStr);
-
-                                rangeCharacters.location = 0;
-                                rangeCharacters.length = ucs2Length;
-                                ::CFStringGetCharacters(inStr, rangeCharacters, pwszString);
-                                pwszString[ucs2Length] = 0x0000; // NULL terminated
-
-                                CFRelease(inStr);
-                        }
+            {
+                // Convert to
+                // Normalization Form C (composed Unicode). We need this because
+                // Mac OS X file system uses NFD (Normalization Form D :decomposed Unicode)
+                // while most other OS', server-side programs usually expect NFC.
+                uint16_t ucs2Length;
+                CFRange rangeCharacters;
+                CFMutableStringRef inStr = ::CFStringCreateMutable(NULL, 0);
+
+                ::CFStringAppendCharacters(inStr, (UniChar *)pwszString, RTUtf16Len (pwszString));
+                ::CFStringNormalize(inStr, kCFStringNormalizationFormC);
+                ucs2Length = ::CFStringGetLength(inStr);
+
+                rangeCharacters.location = 0;
+                rangeCharacters.length = ucs2Length;
+                ::CFStringGetCharacters(inStr, rangeCharacters, pwszString);
+                pwszString[ucs2Length] = 0x0000; // NULL terminated
+
+                CFRelease(inStr);
+            }
 #endif
             pSFDEntry->name.u16Length = (uint32_t)RTUtf16Len (pSFDEntry->name.String.ucs2) * 2;