儲存庫 vbox 的更動 18453

時間撮記:

2009-3-28 上午04:27:36 (16 年 以前)

作者:

vboxsync

訊息:

GuestPropterties/service.cpp: size_t warnings.
Tip: The readbility of the code would benifit enormously by *not* prefixing every statement with 'if (RT_SUCCESS(rc))', just omitting it where it's not necessary would be a great improvement. ;-)

檔案:

• trunk/src/VBox/HostServices/GuestProperties/service.cpp (修改) (6 筆差異)

trunk/src/VBox/HostServices/GuestProperties/service.cpp

@@ -528 +528 @@
     char *pchBuf;
     uint32_t cchName, cchBuf;
-    uint32_t cchFlags, cchBufActual;
     char szFlags[MAX_FLAGS_LEN];
 
@@ -540 +539 @@
        )
         rc = VERR_INVALID_PARAMETER;
-    if (RT_SUCCESS(rc))
+    else
         rc = validateName(pcszName, cchName);
 
@@ -549 +548 @@
     /* Get the value size */
     PropertyList::const_iterator it;
-    bool found = false;
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
+    {
+        rc = VERR_NOT_FOUND;
         for (it = mProperties.begin(); it != mProperties.end(); ++it)
             if (it->mName.compare(pcszName) == 0)
             {
-                found = true;
+                rc = VINF_SUCCESS;
                 break;
             }
-    if (RT_SUCCESS(rc) && !found)
-        rc = VERR_NOT_FOUND;
+    }
     if (RT_SUCCESS(rc))
         rc = writeFlags(it->mFlags, szFlags);
     if (RT_SUCCESS(rc))
-        cchFlags = strlen(szFlags);
-    /* Check that the buffer is big enough */
-    if (RT_SUCCESS(rc))
-    {
-        cchBufActual = it->mValue.size() + 1 + cchFlags;
-        paParms[3].setUInt32 (cchBufActual);
-    }
-    if (RT_SUCCESS(rc) && (cchBufActual > cchBuf))
-        rc = VERR_BUFFER_OVERFLOW;
-    /* Write the value, flags and timestamp */
-    if (RT_SUCCESS(rc))
-    {
-        it->mValue.copy(pchBuf, cchBuf, 0);
-        pchBuf[it->mValue.size()] = '\0'; /* Terminate the value */
-        strcpy(pchBuf + it->mValue.size() + 1, szFlags);
-        paParms[2].setUInt64 (it->mTimestamp);
-    }
-
-    /*
-     * Done!  Do exit logging and return.
-     */
-    if (RT_SUCCESS(rc))
-        Log2(("Queried string %s, value=%s, timestamp=%lld, flags=%s\n",
-              pcszName, it->mValue.c_str(), it->mTimestamp, szFlags));
+    {
+        /* Check that the buffer is big enough */
+        size_t cchBufActual = it->mValue.size() + 1 + strlen(szFlags);
+        paParms[3].setUInt32 ((uint32_t)cchBufActual);
+        if (cchBufActual <= cchBuf)
+        {
+            /* Write the value, flags and timestamp */
+            it->mValue.copy(pchBuf, cchBuf, 0);
+            pchBuf[it->mValue.size()] = '\0'; /* Terminate the value */
+            strcpy(pchBuf + it->mValue.size() + 1, szFlags);
+            paParms[2].setUInt64 (it->mTimestamp);
+
+            /*
+             * Done!  Do exit logging and return.
+             */
+            Log2(("Queried string %s, value=%s, timestamp=%lld, flags=%s\n",
+                  pcszName, it->mValue.c_str(), it->mTimestamp, szFlags));
+        }
+        else
+            rc = VERR_BUFFER_OVERFLOW;
+    }
+
     LogFlowThisFunc(("rc = %Rrc\n", rc));
     return rc;
@@ -839 +836 @@
     if (RT_SUCCESS(rc))
     {
-        paParms[2].setUInt32 (buffer.size());
+        paParms[2].setUInt32 ((uint32_t)buffer.size());
         /* Copy the memory if it fits into the guest buffer */
         if (buffer.size() <= cchBuf)
@@ -908 +905 @@
     {
         paParms[1].setUInt64(u64Timestamp);
-        paParms[3].setUInt32(buffer.size());
+        paParms[3].setUInt32((uint32_t)buffer.size());
         if (buffer.size() <= cchBuf)
             buffer.copy(pchBuf, cchBuf);
@@ -1366 +1363 @@
     return rc;
 }
+