Changeset 13977 in vbox for trunk/src

Timestamp:

Nov 7, 2008 8:14:23 PM (16 years ago)

Author:

vboxsync

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

39016

Message:

C warnings

File:

• trunk/src/VBox/Runtime/generic/uuid-generic.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/generic/uuid-generic.cpp ¶

@@ -105 +105 @@
 RTDECL(int)  RTUuidCompareStr(PCRTUUID pUuid1, const char *pszString)
 {
+    RTUUID Uuid2;
+    int rc;
+
     /* check params */
     AssertPtrReturn(pUuid1, -1);
@@ -112 +115 @@
      * Try convert the string to a UUID and then compare the two.
      */
-    RTUUID Uuid2;
-    int rc = RTUuidFromStr(&Uuid2, pszString);
+    rc = RTUuidFromStr(&Uuid2, pszString);
     AssertRCReturn(rc, 1);
 
@@ -122 +124 @@
 RTDECL(int)  RTUuidToStr(PCRTUUID pUuid, char *pszString, size_t cchString)
 {
+    static const char s_achDigits[17] = "0123456789abcdef";
+    uint32_t u32TimeLow;
+    unsigned u;
+
     /* validate parameters */
     AssertPtrReturn(pUuid, VERR_INVALID_PARAMETER);
@@ -141 +147 @@
      *             pUuid->Gen.au8Node[5]);
      */
-    static const char s_achDigits[17] = "0123456789abcdef";
-    uint32_t u32TimeLow = pUuid->Gen.u32TimeLow;
+    u32TimeLow = pUuid->Gen.u32TimeLow;
     pszString[ 0] = s_achDigits[(u32TimeLow >> 28)/*& 0xf*/];
     pszString[ 1] = s_achDigits[(u32TimeLow >> 24) & 0xf];
@@ -152 +157 @@
     pszString[ 7] = s_achDigits[(u32TimeLow/*>>0*/)& 0xf];
     pszString[ 8] = '-';
-    unsigned u = pUuid->Gen.u16TimeMid;
+    u = pUuid->Gen.u16TimeMid;
     pszString[ 9] = s_achDigits[(u >> 12)/*& 0xf*/];
     pszString[10] = s_achDigits[(u >>  8) & 0xf];