Changeset 71765 in vbox for trunk/src/VBox

Timestamp:

Apr 9, 2018 10:56:03 AM (7 years ago)

Author:

vboxsync

Message:

DevSB16: Don't use RTStrPrintf to name streams 'Output'; eliminated incorrect+unnecessary use of RTStrPrintf in sb16CreateDrvStream.

File:

• trunk/src/VBox/Devices/Audio/DevSB16.cpp (modified) (13 diffs)

trunk/src/VBox/Devices/Audio/DevSB16.cpp

@@ -363 +363 @@
         pCfg->Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfg->Props.cBits, pCfg->Props.cChannels);
 
-        RTStrPrintf(pCfg->szName, sizeof(pCfg->szName), "Output");
+        strcpy(pCfg->szName, "Output");
 
         sb16CloseOut(pThis);
@@ -509 +509 @@
         pCfg->Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfg->Props.cBits, pCfg->Props.cChannels);
 
-        RTStrPrintf(pCfg->szName, sizeof(pCfg->szName), "Output");
+        strcpy(pCfg->szName, "Output");
 
         sb16CloseOut(pThis);
@@ -1061 +1061 @@
 }
 
-static void sb16ResetLegacy(PSB16STATE pThis)
+static void sb16CmdResetLegacy(PSB16STATE pThis)
 {
     LogFlowFuncEnter();
@@ -1085 +1085 @@
     pCfg->Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfg->Props.cBits, pCfg->Props.cChannels);
 
-    RTStrPrintf(pCfg->szName, sizeof(pCfg->szName), "Output");
+    AssertCompile(sizeof(pCfg->szName) > sizeof("Output"));
+    strcpy(pCfg->szName, "Output");
 
     sb16CloseOut(pThis);
 }
 
-static void sb16Reset(PSB16STATE pThis)
+static void sb16CmdReset(PSB16STATE pThis)
 {
     PDMDevHlpISASetIrq(pThis->pDevInsR3, pThis->irq, 0);
@@ -1115 +1116 @@
 
     sb16Control(pThis, 0);
-    sb16ResetLegacy(pThis);
+    sb16CmdResetLegacy(pThis);
 }
 
@@ -1144 +1145 @@
                         }
                         else
-                            sb16Reset(pThis);
+                            sb16CmdReset(pThis);
                     }
                     pThis->v2x6 = 0;
@@ -1160 +1161 @@
 
                 case 0xb8:              /* Panic */
-                    sb16Reset(pThis);
+                    sb16CmdReset(pThis);
                     break;
 
                 case 0x39:
                     dsp_out_data(pThis, 0x38);
-                    sb16Reset(pThis);
+                    sb16CmdReset(pThis);
                     pThis->v2x6 = 0x39;
                     break;
@@ -1756 +1757 @@
 }
 
+/**
+ * @callback_method_impl{FNTMTIMERDEV}
+ */
 static DECLCALLBACK(void) sb16TimerIO(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
@@ -2037 +2041 @@
             pCfg->Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfg->Props.cBits, pCfg->Props.cChannels);
 
-            RTStrPrintf(pCfg->szName, sizeof(pCfg->szName), "Output");
+            strcpy(pCfg->szName, "Output");
 
             sb16CloseOut(pThis);
@@ -2121 +2125 @@
         return VERR_NO_MEMORY;
 
-    if (!RTStrPrintf(pCfgHost->szName, sizeof(pCfgHost->szName), "%s", pCfg->szName))
-    {
-        RTMemFree(pCfgHost);
-        return VERR_BUFFER_OVERFLOW;
-    }
-
     LogFunc(("[LUN#%RU8] %s\n", pDrv->uLUN, pCfgHost->szName));
 
@@ -2471 +2469 @@
     sb16SpeakerControl(pThis, 0);
     sb16Control(pThis, 0);
-    sb16ResetLegacy(pThis);
+    sb16CmdResetLegacy(pThis);
 }
 
@@ -2653 +2651 @@
     LogFunc(("cLUNs=%RU8, rc=%Rrc\n", uLUN, rc));
 
-    sb16ResetLegacy(pThis);
+    sb16CmdResetLegacy(pThis);
 
 #ifdef VBOX_WITH_AUDIO_SB16_ONETIME_INIT
@@ -2679 +2677 @@
             LogRel(("SB16: Falling back to NULL backend (no sound audible)\n"));
 
-            sb16ResetLegacy(pThis);
+            sb16CmdResetLegacy(pThis);
             sb16Reattach(pThis, pDrv, pDrv->uLUN, "NullAudio");