Changeset 81636 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Nov 4, 2019 2:30:47 AM (5 years ago)

Author:

vboxsync

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

134393

Message:

DevVirtioScsi: Put unused stringifiers in LOG_ENABLED ifdefs to make clang happy. bugref:9218 bugref:9440

File:

• trunk/src/VBox/Devices/Storage/DevVirtioSCSI.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/DevVirtioSCSI.cpp

@@ -507 +507 @@
 typedef VIRTIOSCSIREQ *PVIRTIOSCSIREQ;
 
+
+#ifdef LOG_ENABLED
+
 DECLINLINE(const char *) virtioGetTxDirText(uint32_t enmTxDir)
 {
@@ -567 +570 @@
 }
 
-#ifdef LOG_ENABLED
 static uint8_t virtioScsiEstimateCdbLen(uint8_t uCmd, uint8_t cbMax)
 {
@@ -582 +584 @@
     return cbMax;
 }
+
 #endif /* LOG_ENABLED */
-
 
 static int virtioScsiR3SendEvent(PVIRTIOSCSI pThis, uint16_t uTarget, uint32_t uEventType, uint32_t uReason)
@@ -804 +806 @@
     }
 
-    const char *getReqRespText = virtioGetReqRespText(respHdr.uResponse);
-    Log2Func(("status: (%d) %s,   response: (%d) %s\n",
-              pReq->uStatus, SCSIStatusText(pReq->uStatus),
-              respHdr.uResponse, getReqRespText));
-    RT_NOREF(getReqRespText);
+    Log2Func(("status: (%d) %s,   response: (%d) %s\n", pReq->uStatus, SCSIStatusText(pReq->uStatus),
+              respHdr.uResponse, virtioGetReqRespText(respHdr.uResponse)));
 
     if (RT_FAILURE(rcReq))
@@ -818 +817 @@
                   pReq->cbDataIn, pReq->cbDataOut, pReq->pDescChain->cbPhysReturn, pReq->pDescChain->cbPhysSend));
         LogFunc(("xfer = %lu, residual = %u\n", cbXfer, cbResidual));
-        const char *pszTxDirText = virtioGetTxDirText(pReq->enmTxDir);
         LogFunc(("xfer direction: %s, sense written = %d, sense size = %d\n",
-                 pszTxDirText, respHdr.cbSenseLen, pThis->virtioScsiConfig.uSenseSize));
-        RT_NOREF(pszTxDirText);
+                 virtioGetTxDirText(pReq->enmTxDir), respHdr.cbSenseLen, pThis->virtioScsiConfig.uSenseSize));
     }