Changeset 52863 in vbox

Timestamp:

Sep 25, 2014 1:03:51 PM (10 years ago)

Author:

vboxsync

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

96282

Message:

DevACPI: cosmetic changes (use local variables if possible)

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -3200 +3200 @@
 
     char *pszOemId = NULL;
-    rc = CFGMR3QueryStringAllocDef(pThis->pDevInsR3->pCfg, "AcpiOemId", &pszOemId, "VBOX  ");
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pThis->pDevInsR3, rc,
+    rc = CFGMR3QueryStringAllocDef(pCfg, "AcpiOemId", &pszOemId, "VBOX  ");
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"AcpiOemId\" as string failed"));
     size_t cbOemId = strlen(pszOemId);
     if (cbOemId > 6)
-        return PDMDEV_SET_ERROR(pThis->pDevInsR3, rc,
+        return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: \"AcpiOemId\" must contain not more than 6 characters"));
     memset(pThis->au8OemId, ' ', sizeof(pThis->au8OemId));
@@ -3213 +3213 @@
 
     char *pszCreatorId = NULL;
-    rc = CFGMR3QueryStringAllocDef(pThis->pDevInsR3->pCfg, "AcpiCreatorId", &pszCreatorId, "ASL ");
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pThis->pDevInsR3, rc,
+    rc = CFGMR3QueryStringAllocDef(pCfg, "AcpiCreatorId", &pszCreatorId, "ASL ");
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"AcpiCreatorId\" as string failed"));
     size_t cbCreatorId = strlen(pszCreatorId);
     if (cbCreatorId > 4)
-        return PDMDEV_SET_ERROR(pThis->pDevInsR3, rc,
+        return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: \"AcpiCreatorId\" must contain not more than 4 characters"));
     memset(pThis->au8CreatorId, ' ', sizeof(pThis->au8CreatorId));
@@ -3225 +3225 @@
     MMR3HeapFree(pszCreatorId);
 
-    rc = CFGMR3QueryU32Def(pThis->pDevInsR3->pCfg, "AcpiCreatorRev", &pThis->u32CreatorRev, RT_H2LE_U32(0x61));
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pThis->pDevInsR3, rc,
+    rc = CFGMR3QueryU32Def(pCfg, "AcpiCreatorRev", &pThis->u32CreatorRev, RT_H2LE_U32(0x61));
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"AcpiCreatorRev\" as integer failed"));
     pThis->u32OemRevision         = RT_H2LE_U32(0x1);
@@ -3235 +3235 @@
      */
     char *pszCustBinFile;
-    rc = CFGMR3QueryStringAlloc(pThis->pDevInsR3->pCfg, "CustomTable", &pszCustBinFile);
+    rc = CFGMR3QueryStringAlloc(pCfg, "CustomTable", &pszCustBinFile);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        rc = CFGMR3QueryStringAlloc(pThis->pDevInsR3->pCfg, "SLICTable", &pszCustBinFile);
+        rc = CFGMR3QueryStringAlloc(pCfg, "SLICTable", &pszCustBinFile);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
     {
@@ -3244 +3244 @@
     }
     else if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pThis->pDevInsR3, rc,
+        return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"CustomTable\" as a string failed"));
     else if (!*pszCustBinFile)
@@ -3273 +3273 @@
                  * Allocate buffer for the custom table binary data.
                  */
-                pThis->pu8CustBin = (uint8_t *)PDMDevHlpMMHeapAlloc(pThis->pDevInsR3, pThis->cbCustBin);
+                pThis->pu8CustBin = (uint8_t *)PDMDevHlpMMHeapAlloc(pDevIns, pThis->cbCustBin);
                 if (pThis->pu8CustBin)
                 {