VirtualBox

Changeset 81682 in vbox for trunk/src/VBox/Main


Ignore:
Timestamp:
Nov 5, 2019 7:08:21 PM (5 years ago)
Author:
vboxsync
Message:

Main/Console+ConsoleVRDPServer+ApplianceExport+Host+Machine+USBDeviceFilters: fix missing RT_NOREF(...) if VBOX_WITH_USB is undefined

Location:
trunk/src/VBox/Main
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

    r81603 r81682  
    27912791
    27922792#else   /* !VBOX_WITH_USB */
     2793    RT_NOREF(aId, aCaptureFilename);
    27932794    return setError(VBOX_E_PDM_ERROR, tr("The virtual machine does not have a USB controller"));
    27942795#endif  /* !VBOX_WITH_USB */
    … …  
    28532854
    28542855#else   /* !VBOX_WITH_USB */
     2856    RT_NOREF(aId, aDevice);
    28552857    return setError(VBOX_E_PDM_ERROR, tr("The virtual machine does not have a USB controller"));
    28562858#endif  /* !VBOX_WITH_USB */
    … …  
    28852887
    28862888#else   /* !VBOX_WITH_USB */
     2889    RT_NOREF(aName, aDevice);
    28872890    return E_NOTIMPL;
    28882891#endif  /* !VBOX_WITH_USB */
    … …  
    29172920
    29182921#else   /* !VBOX_WITH_USB */
     2922    RT_NOREF(aId, aDevice);
    29192923    return E_NOTIMPL;
    29202924#endif  /* !VBOX_WITH_USB */
    … …  
    58505854
    58515855#else   /* !VBOX_WITH_USB */
     5856    RT_NOREF(aDevice, aError, aMaskedIfs, aCaptureFilename);
    58525857    return E_FAIL;
    58535858#endif  /* !VBOX_WITH_USB */
    … …  
    58615866 */
    58625867HRESULT Console::i_onUSBDeviceDetach(IN_BSTR aId,
    5863                                    IVirtualBoxErrorInfo *aError)
     5868                                     IVirtualBoxErrorInfo *aError)
    58645869{
    58655870#ifdef VBOX_WITH_USB
    … …  
    59425947
    59435948#else   /* !VBOX_WITH_USB */
     5949    RT_NOREF(aId, aError);
    59445950    return E_FAIL;
    59455951#endif  /* !VBOX_WITH_USB */

  • trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp

    r80377 r81682  
    10591059    return USBClientResponseCallback(pvIntercept, u32ClientId, u8Code, pvRet, cbRet);
    10601060#else
     1061    RT_NOREF(pvCallback, pvIntercept, u32ClientId, u8Code, pvRet, cbRet);
    10611062    return VERR_NOT_SUPPORTED;
    10621063#endif
    … …  
    33943395        }
    33953396    }
     3397#else
     3398    RT_NOREF(u32ClientId, ppvIntercept);
    33963399#endif /* VBOX_WITH_USB */
    33973400}
    … …  
    34253428        pRemoteUSBBackend->Release();
    34263429    }
     3430#else
     3431    RT_NOREF(u32ClientId);
    34273432#endif
    34283433}
    … …  
    34633468        return pRemoteUSBBackend->GetBackendCallbackPointer();
    34643469    }
    3465 
     3470#else
     3471    RT_NOREF(u32ClientId, pGuid);
    34663472#endif
    34673473    return NULL;
    … …  
    34923498        }
    34933499    }
     3500#else
     3501    RT_NOREF(pGuid);
    34943502#endif
    34953503}
    … …  
    36013609
    36023610    unlockConsoleVRDPServer();
     3611#else
     3612    RT_NOREF(pRemoteUSBBackend);
    36033613#endif
    36043614}

  • trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp

    r81119 r81682  
    9191        pNewDesc->m->pMachine = this;
    9292
     93#ifdef VBOX_WITH_USB
    9394        // first, call the COM methods, as they request locks
    9495        BOOL fUSBEnabled = FALSE;
    … …  
    108109            }
    109110        }
     111#endif /* VBOX_WITH_USB */
    110112
    111113        // request the machine lock while accessing internal members

  • trunk/src/VBox/Main/src-server/HostImpl.cpp

    r81605 r81682  
    975975     * extended error info to indicate that USB is simply not available
    976976     * (w/o treating it as a failure), for example, as in OSE. */
    977     NOREF(aUSBDevices);
    978 # ifndef RT_OS_WINDOWS
    979     NOREF(aUSBDevices);
    980 # endif
     977    RT_NOREF(aUSBDevices);
    981978    ReturnComNotImplemented();
    982979#endif
    … …  
    10321029     * extended error info to indicate that USB is simply not available
    10331030     * (w/o treating it as a failure), for example, as in OSE. */
    1034     NOREF(aUSBDeviceFilters);
    1035 # ifndef RT_OS_WINDOWS
    1036     NOREF(aUSBDeviceFilters);
    1037 # endif
     1031    RT_NOREF(aUSBDeviceFilters);
    10381032    ReturnComNotImplemented();
    10391033#endif
    … …  
    15471541     * extended error info to indicate that USB is simply not available
    15481542     * (w/o treating it as a failure), for example, as in OSE. */
    1549     NOREF(aName);
    1550     NOREF(aFilter);
     1543    RT_NOREF(aName, aFilter);
    15511544    ReturnComNotImplemented();
    15521545#endif
    … …  
    16081601     * extended error info to indicate that USB is simply not available
    16091602     * (w/o treating it as a failure), for example, as in OSE. */
    1610     NOREF(aPosition);
    1611     NOREF(aFilter);
     1603    RT_NOREF(aPosition, aFilter);
    16121604    ReturnComNotImplemented();
    16131605#endif
    … …  
    16621654     * extended error info to indicate that USB is simply not available
    16631655     * (w/o treating it as a failure), for example, as in OSE. */
    1664     NOREF(aPosition);
     1656    RT_NOREF(aPosition);
    16651657    ReturnComNotImplemented();
    16661658#endif
    … …  
    18511843
    18521844#else   /* !VBOX_WITH_USB */
    1853     NOREF(aName);
    1854     NOREF(aDevice);
     1845    RT_NOREF(aName, aDevice);
    18551846    return E_NOTIMPL;
    18561847#endif  /* !VBOX_WITH_USB */
    … …  
    18861877
    18871878#else   /* !VBOX_WITH_USB */
    1888     NOREF(aId);
    1889     NOREF(aDevice);
     1879    RT_NOREF(aId, aDevice);
    18901880    return E_NOTIMPL;
    18911881#endif  /* !VBOX_WITH_USB */
    … …  
    19291919    return m->pUSBProxyService->addUSBDeviceSource(aBackend, aId, aAddress, aPropertyNames, aPropertyValues);
    19301920#else
     1921    RT_NOREF(aBackend, aId, aAddress, aPropertyNames, aPropertyValues);
    19311922    ReturnComNotImplemented();
    19321923#endif
    … …  
    19391930    return m->pUSBProxyService->removeUSBDeviceSource(aId);
    19401931#else
     1932    RT_NOREF(aId);
    19411933    ReturnComNotImplemented();
    19421934#endif
    … …  
    19801972    rc = m->pUSBProxyService->i_loadSettings(data.llUSBDeviceSources);
    19811973#else
    1982     NOREF(data);
     1974    RT_NOREF(data);
    19831975#endif /* VBOX_WITH_USB */
    19841976    return rc;
    … …  
    20092001    return m->pUSBProxyService->i_saveSettings(data.llUSBDeviceSources);
    20102002#else
    2011     NOREF(data);
     2003    RT_NOREF(data);
    20122004    return S_OK;
    20132005#endif /* VBOX_WITH_USB */
    … …  
    23922384            }
    23932385#else
    2394     NOREF(list);
     2386    RT_NOREF(list);
    23952387    /* PORTME */
    23962388#endif

  • trunk/src/VBox/Main/src-server/MachineImpl.cpp

    r81427 r81682  
    1342613426    return service->captureDeviceForVM(this, aId.ref(), aCaptureFilename);
    1342713427#else
    13428     NOREF(aId);
     13428    RT_NOREF(aId, aCaptureFilename);
    1342913429    return E_NOTIMPL;
    1343013430#endif

  • trunk/src/VBox/Main/src-server/USBDeviceFiltersImpl.cpp

    r76592 r81682  
    516516        pFilter->mInList = true;
    517517    }
     518#else
     519    RT_NOREF(data);
    518520#endif /* VBOX_WITH_USB */
    519521
    … …  
    569571        data.llDeviceFilters.push_back(f);
    570572    }
     573#else
     574    RT_NOREF(data);
    571575#endif /* VBOX_WITH_USB */
    572576
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette