Changeset 59994 in vbox

Timestamp:

Mar 11, 2016 1:49:46 PM (9 years ago)

Author:

vboxsync

Message:

DrvAudio: Added a length parameter for (legacy) options.

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (7 diffs)

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

@@ -181 +181 @@
 }
 
-static int drvAudioProcessOptions(PCFGMNODE pCfgHandle, const char *pszPrefix, struct audio_option *opt)
+static int drvAudioProcessOptions(PCFGMNODE pCfgHandle, const char *pszPrefix, audio_option *paOpts, size_t cOpts)
 {
     AssertPtrReturn(pCfgHandle, VERR_INVALID_POINTER);
-    AssertPtrReturn(pszPrefix, VERR_INVALID_POINTER);
-    AssertPtrReturn(opt, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszPrefix,  VERR_INVALID_POINTER);
+    /* oaOpts and cOpts are optional. */
 
     PCFGMNODE pCfgChildHandle = NULL;
@@ -220 +220 @@
     }
 
-    for (; opt->name; opt++)
-    {
-        LogFlowFunc(("Option value pointer for `%s' is not set\n",
-                     opt->name));
-        if (!opt->valp) {
-            LogFlowFunc(("Option value pointer for `%s' is not set\n",
-                   opt->name));
+    for (size_t i = 0; i < cOpts; i++)
+    {
+        audio_option *pOpt = &paOpts[i];
+        if (!pOpt->valp)
+        {
+            LogFlowFunc(("Option value pointer for `%s' is not set\n", pOpt->name));
             continue;
         }
@@ -232 +231 @@
         bool fUseDefault;
 
-        switch (opt->tag)
+        switch (pOpt->tag)
         {
             case AUD_OPT_BOOL:
             case AUD_OPT_INT:
             {
-                int *intp = (int *)opt->valp;
-                *intp = drvAudioGetConfInt(pCfgHandle, opt->name, *intp, &fUseDefault);
+                int *intp = (int *)pOpt->valp;
+                *intp = drvAudioGetConfInt(pCfgHandle, pOpt->name, *intp, &fUseDefault);
 
                 break;
@@ -245 +244 @@
             case AUD_OPT_FMT:
             {
-                PDMAUDIOFMT *fmtp = (PDMAUDIOFMT *)opt->valp;
-                *fmtp = drvAudioGetConfFormat(pCfgHandle, opt->name, *fmtp, &fUseDefault);
+                PDMAUDIOFMT *fmtp = (PDMAUDIOFMT *)pOpt->valp;
+                *fmtp = drvAudioGetConfFormat(pCfgHandle, pOpt->name, *fmtp, &fUseDefault);
 
                 break;
@@ -253 +252 @@
             case AUD_OPT_STR:
             {
-                const char **strp = (const char **)opt->valp;
-                *strp = drvAudioGetConfStr(pCfgHandle, opt->name, *strp, &fUseDefault);
+                const char **strp = (const char **)pOpt->valp;
+                *strp = drvAudioGetConfStr(pCfgHandle, pOpt->name, *strp, &fUseDefault);
 
                 break;
@@ -260 +259 @@
 
             default:
-                LogFlowFunc(("Bad value tag for option `%s' - %d\n", opt->name, opt->tag));
+                LogFlowFunc(("Bad value tag for option `%s' - %d\n", pOpt->name, pOpt->tag));
                 fUseDefault = false;
                 break;
         }
 
-        if (!opt->overridenp)
-            opt->overridenp = &opt->overriden;
-
-        *opt->overridenp = !fUseDefault;
+        if (!pOpt->overridenp)
+            pOpt->overridenp = &pOpt->overriden;
+
+        *pOpt->overridenp = !fUseDefault;
     }
 
@@ -1777 +1776 @@
     if (RT_SUCCESS(rc))
     {
-        rc = drvAudioProcessOptions(pCfgHandle, "AUDIO", audio_options);
+        rc = drvAudioProcessOptions(pCfgHandle, "AUDIO", audio_options, RT_ELEMENTS(audio_options));
         /** @todo Check for invalid options? */