Changeset 48400 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 10, 2013 8:38:28 AM (11 years ago)

Author:

vboxsync

Message:

DevEFI.cpp: style and docs.

File:

• trunk/src/VBox/Devices/EFI/DevEFI.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -1661 +1661 @@
 
 
-static int efiParseDeviceString(PDEVEFI  pThis, char *pszDeviceProps)
-{
-    int         rc = 0;
-    uint32_t    iStr, iHex, u32OutLen;
-    uint8_t     u8Value = 0;                    /* (shut up gcc) */
-    bool        fUpper = true;
-
-    u32OutLen = (uint32_t)RTStrNLen(pszDeviceProps, RTSTR_MAX) / 2 + 1;
-
-    pThis->pbDeviceProps = (uint8_t *)PDMDevHlpMMHeapAlloc(pThis->pDevIns, u32OutLen);
+/**
+ * Converts a hex string into a binary data blob located at
+ * pThis->pbDeviceProps, size returned as pThis->cbDeviceProps.
+ *
+ * @returns VERR_NO_MEMORY or VINF_SUCCESS.
+ * @param   pThis           The EFI instance data.
+ * @param   pszDeviceProps  The device property hex string to decode.
+ */
+static int efiParseDeviceString(PDEVEFI pThis, const char *pszDeviceProps)
+{
+    uint32_t const cbOut = (uint32_t)RTStrNLen(pszDeviceProps, RTSTR_MAX) / 2 + 1;
+    pThis->pbDeviceProps = (uint8_t *)PDMDevHlpMMHeapAlloc(pThis->pDevIns, cbOut);
     if (!pThis->pbDeviceProps)
         return VERR_NO_MEMORY;
 
-    for (iStr=0, iHex = 0; pszDeviceProps[iStr]; iStr++)
+    uint32_t    iHex    = 0;
+    bool        fUpper  = true;
+    uint8_t     u8Value = 0;                    /* (shut up gcc) */
+    for (uint32_t iStr = 0; pszDeviceProps[iStr]; iStr++)
     {
         uint8_t u8Hb = efiGetHalfByte(pszDeviceProps[iStr]);
@@ -1685 +1690 @@
             pThis->pbDeviceProps[iHex++] = u8Hb | u8Value;
 
-        Assert(iHex < u32OutLen);
+        Assert(iHex < cbOut);
         fUpper = !fUpper;
     }
@@ -1692 +1697 @@
     pThis->cbDeviceProps = iHex;
 
-    return rc;
+    return VINF_SUCCESS;
 }