[vbox-dev] [PATCH 2/2] tree-wide: use RT_NOREF instead of the non-variadic variants
Florian Klink
flokli at flokli.de
Sun Dec 24 23:50:46 GMT 2017
Signed-off-by: Florian Klink <flokli at flokli.de>
---
.../Additions/common/VBoxGuest/VBoxGuest-win.cpp | 14 ++--
src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp | 16 ++--
.../VBoxGuest/lib/VBoxGuestR0LibHGCMInternal.cpp | 8 +-
.../common/VBoxGuest/lib/VBoxGuestR3Lib.cpp | 2 +-
.../common/VBoxService/VBoxService-win.cpp | 4 +-
.../VBoxService/VBoxServiceControlProcess.cpp | 6 +-
.../VBoxService/VBoxServiceControlSession.cpp | 4 +-
.../common/VBoxService/VBoxServicePropCache.cpp | 4 +-
src/VBox/Additions/common/pam/pam_vbox.cpp | 8 +-
src/VBox/Additions/x11/VBoxClient/clipboard.cpp | 8 +-
src/VBox/Additions/x11/VBoxClient/display.cpp | 2 +-
src/VBox/Additions/x11/VBoxClient/draganddrop.cpp | 2 +-
src/VBox/Additions/x11/VBoxClient/main.cpp | 2 +-
src/VBox/Additions/x11/VBoxClient/seamless.cpp | 4 +-
.../VBoxClient/testcase/tstSeamlessX11-auto.cpp | 14 ++--
src/VBox/Debugger/DBGCBuiltInSymbols.cpp | 2 +-
src/VBox/Debugger/DBGCCommands.cpp | 8 +-
src/VBox/Debugger/DBGCEmulateCodeView.cpp | 4 +-
src/VBox/Debugger/DBGCEval.cpp | 4 +-
src/VBox/Debugger/DBGPlugInDarwin.cpp | 2 +-
src/VBox/Debugger/DBGPlugInLinux.cpp | 4 +-
src/VBox/Debugger/DBGPlugInSolaris.cpp | 4 +-
src/VBox/Devices/EFI/DevSmc.cpp | 36 ++++----
src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp | 2 +-
src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp | 2 +-
src/VBox/Devices/Graphics/DevVGA.cpp | 4 +-
src/VBox/Devices/Input/PS2K.cpp | 6 +-
src/VBox/Devices/Input/PS2M.cpp | 6 +-
src/VBox/Devices/Input/UsbKbd.cpp | 2 +-
src/VBox/Devices/Network/DevE1000.cpp | 6 +-
src/VBox/Devices/Network/DevE1000Phy.cpp | 2 +-
src/VBox/Devices/Network/DevPCNet.cpp | 2 +-
src/VBox/Devices/Network/SrvIntNetR0.cpp | 4 +-
src/VBox/Devices/Network/slirp/ip_icmpwin.c | 2 +-
src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp | 4 +-
src/VBox/Devices/PC/DevFwCommon.cpp | 2 +-
src/VBox/Devices/PC/DevLPC.cpp | 4 +-
src/VBox/Devices/PC/DevPcBios.cpp | 2 +-
src/VBox/Devices/Storage/DevAHCI.cpp | 82 +++++++++---------
src/VBox/Devices/Storage/DevATA.cpp | 20 ++---
src/VBox/Devices/Storage/DrvSCSI.cpp | 2 +-
src/VBox/Devices/Storage/UsbMsd.cpp | 2 +-
src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp | 2 +-
src/VBox/Devices/USB/DevOHCI.cpp | 88 +++++++++----------
src/VBox/Devices/VMMDev/VMMDev.cpp | 2 +-
src/VBox/Disassembler/testcase/tstDisasm-1.cpp | 2 +-
src/VBox/Disassembler/testcase/tstDisasm-2.cpp | 2 +-
.../ExtPacks/VBoxDTrace/onnv/cmd/dtrace/dtrace.c | 20 ++---
.../VBoxDTrace/onnv/common/ctf/ctf_create.c | 2 +-
.../VBoxDTrace/onnv/lib/libctf/common/ctf_lib.c | 2 +-
.../VBoxDTrace/onnv/lib/libctf/common/ctf_subr.c | 2 +-
.../onnv/lib/libdtrace/common/dt_aggregate.c | 10 +--
.../VBoxDTrace/onnv/lib/libdtrace/common/dt_as.c | 4 +-
.../VBoxDTrace/onnv/lib/libdtrace/common/dt_cc.c | 16 ++--
.../onnv/lib/libdtrace/common/dt_consume.c | 6 +-
.../VBoxDTrace/onnv/lib/libdtrace/common/dt_decl.c | 2 +-
.../VBoxDTrace/onnv/lib/libdtrace/common/dt_dis.c | 22 ++---
.../onnv/lib/libdtrace/common/dt_error.c | 2 +-
.../onnv/lib/libdtrace/common/dt_ident.c | 8 +-
.../onnv/lib/libdtrace/common/dt_module.c | 6 +-
.../onnv/lib/libdtrace/common/dt_options.c | 50 +++++------
.../onnv/lib/libdtrace/common/dt_parser.c | 14 ++--
.../onnv/lib/libdtrace/common/dt_pragma.c | 4 +-
.../onnv/lib/libdtrace/common/dt_printf.c | 76 ++++++++---------
.../onnv/lib/libdtrace/common/dt_program.c | 4 +-
.../onnv/lib/libdtrace/common/dt_provider.c | 4 +-
.../VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c | 4 +-
.../onnv/lib/libdtrace/common/dt_xlator.c | 2 +-
src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp | 4 +-
src/VBox/GuestHost/DragAndDrop/DnDPath.cpp | 6 +-
.../GuestHost/OpenGL/packer/pack_visibleregion.c | 2 +-
src/VBox/GuestHost/OpenGL/util/mem.c | 4 +-
.../GuestHost/SharedClipboard/x11-clipboard.cpp | 44 +++++-----
src/VBox/HostDrivers/Support/SUPDrv.cpp | 6 +-
src/VBox/HostDrivers/Support/SUPDrvGip.cpp | 6 +-
src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp | 2 +-
.../HostDrivers/Support/SUPR3HardenedVerify.cpp | 12 +--
.../HostDrivers/Support/linux/SUPLib-linux.cpp | 2 +-
src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp | 24 +++---
.../Support/win/SUPHardenedVerifyImage-win.cpp | 10 +--
.../Support/win/SUPHardenedVerifyProcess-win.cpp | 4 +-
src/VBox/HostDrivers/Support/win/SUPLib-win.cpp | 4 +-
.../HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp | 4 +-
.../VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp | 7 +-
.../VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp | 8 +-
.../VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp | 18 ++--
.../VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp | 24 +++---
.../VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp | 4 +-
.../VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp | 2 +-
.../VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp | 2 +-
.../VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp | 2 +-
.../VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp | 2 +-
.../VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp | 2 +-
src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp | 2 +-
.../VBoxUSB/win/Install/USBUninstall.cpp | 2 +-
.../HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp | 2 +-
.../HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp | 4 +-
.../HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp | 6 +-
src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp | 2 +-
.../HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp | 4 +-
.../HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp | 4 +-
.../HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp | 2 +-
.../HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp | 10 +--
.../HostDrivers/VBoxUSB/win/testcase/USBTest.cpp | 2 +-
src/VBox/HostServices/GuestControl/service.cpp | 8 +-
src/VBox/HostServices/GuestProperties/service.cpp | 2 +-
.../GuestProperties/testcase/tstGuestPropSvc.cpp | 2 +-
src/VBox/HostServices/HostChannel/HostChannel.cpp | 4 +-
.../SharedClipboard/VBoxClipboard-win.cpp | 2 +-
.../HostServices/SharedClipboard/x11-clipboard.cpp | 8 +-
src/VBox/HostServices/SharedFolders/mappings.cpp | 8 +-
.../testcase/tstSharedFolderService.cpp | 98 +++++++++++-----------
.../SharedFolders/testcase/tstShflCase.cpp | 8 +-
src/VBox/HostServices/SharedFolders/vbsf.cpp | 12 +--
.../win/InstallHelper/VBoxInstallHelper.cpp | 8 +-
.../Main/src-helper-apps/VBoxExtPackHelperApp.cpp | 8 +-
src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp | 2 +-
src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp | 4 +-
src/VBox/Runtime/r3/win/krnlmod-win.cpp | 2 +-
src/VBox/Runtime/testcase/tstRTVfs.cpp | 2 +-
src/VBox/Runtime/tools/RTDbgSymCache.cpp | 4 +-
src/VBox/Runtime/tools/RTGzip.cpp | 4 +-
src/VBox/Storage/CUE.cpp | 2 +-
src/VBox/Storage/ISCSI.cpp | 2 +-
src/VBox/Storage/Parallels.cpp | 2 +-
src/VBox/Storage/QCOW.cpp | 4 +-
src/VBox/Storage/QED.cpp | 4 +-
src/VBox/Storage/RAW.cpp | 2 +-
src/VBox/Storage/VCICache.cpp | 2 +-
src/VBox/Storage/VD.cpp | 4 +-
src/VBox/Storage/VHD.cpp | 4 +-
src/VBox/Storage/VMDK.cpp | 6 +-
src/VBox/Storage/testcase/VDMemDisk.cpp | 2 +-
src/VBox/Storage/testcase/VDScript.cpp | 4 +-
src/VBox/Storage/testcase/VDScriptInterp.cpp | 2 +-
src/VBox/Storage/testcase/tstVD.cpp | 2 +-
src/VBox/Storage/testcase/tstVDSnap.cpp | 4 +-
src/VBox/VMM/VMMR3/PDM.cpp | 2 +-
src/VBox/VMM/VMMR3/VM.cpp | 2 +-
src/VBox/VMM/tools/VBoxCpuReport.cpp | 2 +-
src/VBox/ValidationKit/utils/nt/nttimesources.cpp | 2 +-
.../utils/usb/UsbTestServiceGadgetHostUsbIp.cpp | 2 +-
src/bldprogs/scm.cpp | 2 +-
src/bldprogs/scmrw.cpp | 16 ++--
144 files changed, 591 insertions(+), 588 deletions(-)
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
index af2f381480..7620592411 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
@@ -950,7 +950,7 @@ static NTSTATUS vgdrvNtNt5PlusAddDevice(PDRIVER_OBJECT pDrvObj, PDEVICE_OBJECT p
*/
static NTSTATUS vgdrvNt5PlusPnpIrpComplete(PDEVICE_OBJECT pDevObj, PIRP pIrp, PKEVENT pEvent)
{
- RT_NOREF2(pDevObj, pIrp);
+ RT_NOREF(pDevObj, pIrp);
KeSetEvent(pEvent, 0, FALSE);
return STATUS_MORE_PROCESSING_REQUIRED;
}
@@ -1349,7 +1349,7 @@ static NTSTATUS vgdrvNtNt5PlusPnP(PDEVICE_OBJECT pDevObj, PIRP pIrp)
static NTSTATUS vgdrvNtNt5PlusPowerComplete(IN PDEVICE_OBJECT pDevObj, IN PIRP pIrp, IN PVOID pContext)
{
#ifdef VBOX_STRICT
- RT_NOREF1(pDevObj);
+ RT_NOREF(pDevObj);
PVBOXGUESTDEVEXTWIN pDevExt = (PVBOXGUESTDEVEXTWIN)pContext;
PIO_STACK_LOCATION pIrpSp = IoGetCurrentIrpStackLocation(pIrp);
@@ -1382,7 +1382,7 @@ static NTSTATUS vgdrvNtNt5PlusPowerComplete(IN PDEVICE_OBJECT pDevObj, IN PIRP p
}
}
#else
- RT_NOREF3(pDevObj, pIrp, pContext);
+ RT_NOREF(pDevObj, pIrp, pContext);
#endif
return STATUS_SUCCESS;
@@ -1615,7 +1615,7 @@ static void vgdrvNtUnload(PDRIVER_OBJECT pDrvObj)
* On a PnP driver this routine will be called after IRP_MN_REMOVE_DEVICE
* where we already did the cleanup, so don't do anything here (yet).
*/
- RT_NOREF1(pDrvObj);
+ RT_NOREF(pDrvObj);
#endif /* !TARGET_NT4 */
VGDrvCommonDestroyLoggers();
@@ -1931,7 +1931,7 @@ static NTSTATUS vgdrvNtShutdown(PDEVICE_OBJECT pDevObj, PIRP pIrp)
*/
static NTSTATUS vgdrvNtNotSupportedStub(PDEVICE_OBJECT pDevObj, PIRP pIrp)
{
- RT_NOREF1(pDevObj);
+ RT_NOREF(pDevObj);
LogFlowFuncEnter();
pIrp->IoStatus.Information = 0;
@@ -1972,7 +1972,7 @@ int VGDrvNativeSetMouseNotifyCallback(PVBOXGUESTDEVEXT pDevExt, PVBGLIOCSETMOUSE
*/
static void NTAPI vgdrvNtDpcHandler(PKDPC pDPC, PDEVICE_OBJECT pDevObj, PIRP pIrp, PVOID pContext)
{
- RT_NOREF3(pDPC, pIrp, pContext);
+ RT_NOREF(pDPC, pIrp, pContext);
PVBOXGUESTDEVEXTWIN pDevExt = (PVBOXGUESTDEVEXTWIN)pDevObj->DeviceExtension;
Log3Func(("pDevExt=0x%p\n", pDevExt));
@@ -2005,7 +2005,7 @@ static void NTAPI vgdrvNtDpcHandler(PKDPC pDPC, PDEVICE_OBJECT pDevObj, PIRP pIr
*/
static BOOLEAN NTAPI vgdrvNtIsrHandler(PKINTERRUPT pInterrupt, PVOID pServiceContext)
{
- RT_NOREF1(pInterrupt);
+ RT_NOREF(pInterrupt);
PVBOXGUESTDEVEXTWIN pDevExt = (PVBOXGUESTDEVEXTWIN)pServiceContext;
if (pDevExt == NULL)
return FALSE;
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
index 45d0468445..5fc57dd6aa 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
@@ -617,7 +617,7 @@ static int vgdrvSetBalloonSizeFromUser(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSI
PRTR0MEMOBJ pMemObj = NULL;
int rc = VINF_SUCCESS;
uint32_t i;
- RT_NOREF1(pSession);
+ RT_NOREF(pSession);
if (fInflate)
{
@@ -917,7 +917,7 @@ int VGDrvCommonReinitDevExtAfterHibernation(PVBOXGUESTDEVEXT pDevExt, VBOXOSTYPE
else
Log(("VGDrvCommonReinitDevExtAfterHibernation: could not report guest information to host, rc=%Rrc\n", rc));
LogFlow(("VGDrvCommonReinitDevExtAfterHibernation: returned with rc=%Rrc\n", rc));
- RT_NOREF1(pDevExt);
+ RT_NOREF(pDevExt);
return rc;
}
@@ -1902,7 +1902,7 @@ static int vgdrvIoCtl_DriverVersionInfo(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESS
int rc;
LogFlow(("VBGL_IOCTL_DRIVER_VERSION_INFO: uReqVersion=%#x uMinVersion=%#x uReserved1=%#x uReserved2=%#x\n",
pReq->u.In.uReqVersion, pReq->u.In.uMinVersion, pReq->u.In.uReserved1, pReq->u.In.uReserved2));
- RT_NOREF2(pDevExt, pSession);
+ RT_NOREF(pDevExt, pSession);
/*
* Input validation.
@@ -2291,7 +2291,7 @@ static int vgdrvCheckIfVmmReqIsAllowed(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSI
{
kLevel_Invalid, kLevel_NoOne, kLevel_OnlyVBoxGuest, kLevel_OnlyKernel, kLevel_TrustedUsers, kLevel_AllUsers
} enmRequired;
- RT_NOREF1(pDevExt);
+ RT_NOREF(pDevExt);
switch (enmType)
{
@@ -2946,7 +2946,7 @@ static int vgdrvIoCtl_WriteCoreDump(PVBOXGUESTDEVEXT pDevExt, PVBGLIOCWRITECORED
VMMDevReqWriteCoreDump *pReq = NULL;
int rc;
LogFlow(("VBOXGUEST_IOCTL_WRITE_CORE_DUMP\n"));
- RT_NOREF1(pDevExt);
+ RT_NOREF(pDevExt);
rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_WriteCoreDump);
if (RT_SUCCESS(rc))
@@ -3113,7 +3113,7 @@ static int vgdrvResetEventFilterOnHost(PVBOXGUESTDEVEXT pDevExt, uint32_t fFixed
LogRelFunc(("failed with rc=%Rrc\n", rc));
VbglR0GRFree(&pReq->header);
}
- RT_NOREF1(pDevExt);
+ RT_NOREF(pDevExt);
return rc;
}
@@ -3265,7 +3265,7 @@ static int vgdrvResetMouseStatusOnHost(PVBOXGUESTDEVEXT pDevExt)
LogRelFunc(("failed with rc=%Rrc\n", rc));
VbglR0GRFree(&pReq->header);
}
- RT_NOREF1(pDevExt);
+ RT_NOREF(pDevExt);
return rc;
}
@@ -3463,7 +3463,7 @@ static int vgdrvResetCapabilitiesOnHost(PVBOXGUESTDEVEXT pDevExt)
LogRelFunc(("failed with rc=%Rrc\n", rc));
VbglR0GRFree(&pReq->header);
}
- RT_NOREF1(pDevExt);
+ RT_NOREF(pDevExt);
return rc;
}
diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibHGCMInternal.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibHGCMInternal.cpp
index bf41bf74fc..8025368688 100644
--- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibHGCMInternal.cpp
+++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibHGCMInternal.cpp
@@ -483,9 +483,9 @@ static void vbglR0HGCMInternalInitCall(VMMDevHGCMCall *pHGCMCall, PCVBGLIOCHGCMC
uint32_t offExtra = (uint32_t)((uintptr_t)(pDstParm + cParms) - (uintptr_t)pHGCMCall);
uint32_t iLockBuf = 0;
uint32_t iParm;
- RT_NOREF1(cbCallInfo);
+ RT_NOREF(cbCallInfo);
#ifndef USE_BOUNCE_BUFFERS
- RT_NOREF1(fIsUser);
+ RT_NOREF(fIsUser);
#endif
/*
@@ -765,9 +765,9 @@ static int vbglR0HGCMInternalCopyBackResult(PVBGLIOCHGCMCALL pCallInfo, VMMDevHG
uint32_t iLockBuf = 0;
#endif
uint32_t iParm;
- RT_NOREF1(pParmInfo);
+ RT_NOREF(pParmInfo);
#ifndef USE_BOUNCE_BUFFERS
- RT_NOREF1(fIsUser);
+ RT_NOREF(fIsUser);
#endif
/*
diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3Lib.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3Lib.cpp
index 0b9c4d36d1..ab5b5f53ec 100644
--- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3Lib.cpp
+++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3Lib.cpp
@@ -383,7 +383,7 @@ VBGLR3DECL(void) VbglR3Term(void)
*/
int vbglR3DoIOCtlRaw(uintptr_t uFunction, PVBGLREQHDR pHdr, size_t cbReq)
{
- Assert(cbReq == RT_MAX(pHdr->cbIn, pHdr->cbOut)); RT_NOREF1(cbReq);
+ Assert(cbReq == RT_MAX(pHdr->cbIn, pHdr->cbOut)); RT_NOREF(cbReq);
Assert(pHdr->cbOut != 0);
#if defined(RT_OS_WINDOWS)
diff --git a/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp b/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp
index 6ea6846cfb..e191c20c5d 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp
@@ -597,7 +597,7 @@ static VOID WINAPI vgsvcWinCtrlHandlerNt4(DWORD dwControl)
static DWORD WINAPI vgsvcWinCtrlHandlerNt5Plus(DWORD dwControl, DWORD dwEventType, LPVOID lpEventData, LPVOID lpContext)
{
VGSvcVerbose(2, "Control handler: dwControl=%#x, dwEventType=%#x\n", dwControl, dwEventType);
- RT_NOREF1(lpContext);
+ RT_NOREF(lpContext);
switch (dwControl)
{
@@ -625,7 +625,7 @@ static DWORD WINAPI vgsvcWinCtrlHandlerNt5Plus(DWORD dwControl, DWORD dwEventTyp
static void WINAPI vgsvcWinMain(DWORD argc, LPTSTR *argv)
{
- RT_NOREF2(argc, argv);
+ RT_NOREF(argc, argv);
VGSvcVerbose(2, "Registering service control handler ...\n");
if (g_pfnRegisterServiceCtrlHandlerExA)
g_hWinServiceStatus = g_pfnRegisterServiceCtrlHandlerExA(VBOXSERVICE_NAME, vgsvcWinCtrlHandlerNt5Plus, NULL);
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp
index 8116a422e9..e15722656e 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp
@@ -361,7 +361,7 @@ static int vgsvcGstCtrlProcessPollsetOnInput(PVBOXSERVICECTRLPROCESS pProcess, u
static int vgsvcGstCtrlProcessHandleOutputError(PVBOXSERVICECTRLPROCESS pProcess,
uint32_t fPollEvt, PRTPIPE phPipeR, uint32_t idPollHnd)
{
- RT_NOREF1(fPollEvt);
+ RT_NOREF(fPollEvt);
AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
if (!phPipeR)
@@ -1217,7 +1217,7 @@ static int vgsvcGstCtrlProcessCreateProcess(const char *pszExec, const char * co
PRTPROCESS phProcess)
{
#ifndef RT_OS_WINDOWS
- RT_NOREF1(pszDomain);
+ RT_NOREF(pszDomain);
#endif
AssertPtrReturn(pszExec, VERR_INVALID_PARAMETER);
AssertPtrReturn(papszArgs, VERR_INVALID_PARAMETER);
@@ -2027,7 +2027,7 @@ static DECLCALLBACK(int) vgsvcGstCtrlProcessOnTerm(PVBOXSERVICECTRLPROCESS pThis
static int vgsvcGstCtrlProcessRequestExV(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx, bool fAsync,
RTMSINTERVAL uTimeoutMS, PRTREQ pReq, PFNRT pfnFunction, unsigned cArgs, va_list Args)
{
- RT_NOREF1(pHostCtx);
+ RT_NOREF(pHostCtx);
AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
/* pHostCtx is optional. */
AssertPtrReturn(pfnFunction, VERR_INVALID_POINTER);
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp
index 4363e4a011..fc1bc97e6f 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp
@@ -1649,7 +1649,7 @@ int VGSvcGstCtrlSessionProcessStartAllowed(const PVBOXSERVICECTRLSESSION pSessio
static int vgsvcVGSvcGstCtrlSessionThreadCreateProcess(const PVBOXSERVICECTRLSESSIONSTARTUPINFO pSessionStartupInfo,
PVBOXSERVICECTRLSESSIONTHREAD pSessionThread, uint32_t uCtrlSessionThread)
{
- RT_NOREF1(uCtrlSessionThread);
+ RT_NOREF(uCtrlSessionThread);
/*
* Is this an anonymous session? Anonymous sessions run with the same
@@ -2013,7 +2013,7 @@ int VGSvcGstCtrlSessionThreadCreate(PRTLISTANCHOR pList, const PVBOXSERVICECTRLS
*/
int VGSvcGstCtrlSessionThreadWait(PVBOXSERVICECTRLSESSIONTHREAD pThread, uint32_t uTimeoutMS, uint32_t fFlags)
{
- RT_NOREF1(fFlags);
+ RT_NOREF(fFlags);
AssertPtrReturn(pThread, VERR_INVALID_POINTER);
/** @todo Validate closing flags. */
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp b/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp
index 617d508adb..a052955e2c 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp
@@ -35,7 +35,7 @@
static PVBOXSERVICEVEPROPCACHEENTRY vgsvcPropCacheFindInternal(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName,
uint32_t fFlags)
{
- RT_NOREF1(fFlags);
+ RT_NOREF(fFlags);
AssertPtrReturn(pCache, NULL);
AssertPtrReturn(pszName, NULL);
@@ -318,7 +318,7 @@ int VGSvcPropCacheUpdate(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, co
int VGSvcPropCacheUpdateByPath(PVBOXSERVICEVEPROPCACHE pCache, const char *pszValue, uint32_t fFlags,
const char *pszPathFormat, ...)
{
- RT_NOREF1(fFlags);
+ RT_NOREF(fFlags);
AssertPtrReturn(pCache, VERR_INVALID_POINTER);
AssertPtrReturn(pszPathFormat, VERR_INVALID_POINTER);
diff --git a/src/VBox/Additions/common/pam/pam_vbox.cpp b/src/VBox/Additions/common/pam/pam_vbox.cpp
index fa5e746434..31642acf6e 100644
--- a/src/VBox/Additions/common/pam/pam_vbox.cpp
+++ b/src/VBox/Additions/common/pam/pam_vbox.cpp
@@ -119,7 +119,7 @@ static void pam_vbox_writesyslog(char *pszBuf)
*/
static void pam_vbox_error(pam_handle_t *hPAM, const char *pszFormat, ...)
{
- RT_NOREF1(hPAM);
+ RT_NOREF(hPAM);
va_list va;
char *buf;
va_start(va, pszFormat);
@@ -142,7 +142,7 @@ static void pam_vbox_error(pam_handle_t *hPAM, const char *pszFormat, ...)
*/
static void pam_vbox_log(pam_handle_t *hPAM, const char *pszFormat, ...)
{
- RT_NOREF1(hPAM);
+ RT_NOREF(hPAM);
if (g_verbosity)
{
va_list va;
@@ -307,7 +307,7 @@ static int pam_vbox_init(pam_handle_t *hPAM)
*/
static void pam_vbox_shutdown(pam_handle_t *hPAM)
{
- RT_NOREF1(hPAM);
+ RT_NOREF(hPAM);
VbglR3Term();
}
@@ -680,7 +680,7 @@ static DECLCALLBACK(int) pam_vbox_wait_thread(RTTHREAD hThreadSelf, void *pvUser
*/
static int pam_vbox_wait_for_creds(pam_handle_t *hPAM, uint32_t uClientID, uint32_t uTimeoutMS)
{
- RT_NOREF1(uClientID);
+ RT_NOREF(uClientID);
PAMVBOXTHREAD threadData;
threadData.hPAM = hPAM;
threadData.uTimeoutMS = uTimeoutMS;
diff --git a/src/VBox/Additions/x11/VBoxClient/clipboard.cpp b/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
index 0b4047611b..e0e18317b7 100644
--- a/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
@@ -87,7 +87,7 @@ static int vboxClipboardSendData(uint32_t u32Format, void *pv, uint32_t cb)
*/
int ClipRequestDataForX11(VBOXCLIPBOARDCONTEXT *pCtx, uint32_t u32Format, void **ppv, uint32_t *pcb)
{
- RT_NOREF1(pCtx);
+ RT_NOREF(pCtx);
int rc = VINF_SUCCESS;
uint32_t cb = 1024;
void *pv = RTMemAlloc(cb);
@@ -149,7 +149,7 @@ struct _CLIPREADCBREQ
*/
void ClipReportX11Formats(VBOXCLIPBOARDCONTEXT *pCtx, uint32_t u32Formats)
{
- RT_NOREF1(pCtx);
+ RT_NOREF(pCtx);
LogRelFlowFunc(("u32Formats=%d\n", u32Formats));
int rc = VbglR3ClipboardReportFormats(g_ctx.client, u32Formats);
LogRelFlowFunc(("rc=%Rrc\n", rc));
@@ -167,7 +167,7 @@ void ClipReportX11Formats(VBOXCLIPBOARDCONTEXT *pCtx, uint32_t u32Formats)
*/
void ClipCompleteDataRequestFromX11(VBOXCLIPBOARDCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
{
- RT_NOREF1(pCtx);
+ RT_NOREF(pCtx);
if (RT_SUCCESS(rc))
vboxClipboardSendData(pReq->u32Format, pv, cb);
else
@@ -287,7 +287,7 @@ static const char *getPidFilePath()
static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
{
- RT_NOREF2(ppInterface, fDaemonised);
+ RT_NOREF(ppInterface, fDaemonised);
/* Initialise the guest library. */
int rc = VbglR3InitUser();
diff --git a/src/VBox/Additions/x11/VBoxClient/display.cpp b/src/VBox/Additions/x11/VBoxClient/display.cpp
index 4ffffd8067..38b12eca56 100644
--- a/src/VBox/Additions/x11/VBoxClient/display.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/display.cpp
@@ -251,7 +251,7 @@ static int init(struct VBCLSERVICE **ppInterface)
static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
{
- RT_NOREF1(fDaemonised);
+ RT_NOREF(fDaemonised);
struct DISPLAYSTATE *pSelf = getStateFromInterface(ppInterface);
if (!pSelf->mfInit)
diff --git a/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp b/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp
index 620667737f..70005dcfce 100644
--- a/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp
@@ -1865,7 +1865,7 @@ int DragInstance::hgDrop(uint32_t u32xPos, uint32_t u32yPos, uint32_t uDefaultAc
/** @todo r=bird: Please, stop using 'u32' as a prefix unless you've got a _real_ _important_ reason for needing the bit count. */
- RT_NOREF3(u32xPos, u32yPos, uDefaultAction);
+ RT_NOREF(u32xPos, u32yPos, uDefaultAction);
LogFlowThisFunc(("wndCur=%#x, wndProxy=%#x, mode=%RU32, state=%RU32\n", m_wndCur, m_wndProxy.hWnd, m_enmMode, m_enmState));
LogFlowThisFunc(("u32xPos=%RU32, u32yPos=%RU32, uAction=%RU32\n", u32xPos, u32yPos, uDefaultAction));
diff --git a/src/VBox/Additions/x11/VBoxClient/main.cpp b/src/VBox/Additions/x11/VBoxClient/main.cpp
index 46ee86dca5..60fce25736 100644
--- a/src/VBox/Additions/x11/VBoxClient/main.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/main.cpp
@@ -146,7 +146,7 @@ static int vboxClientXLibErrorHandler(Display *pDisplay, XErrorEvent *pError)
*/
static int vboxClientXLibIOErrorHandler(Display *pDisplay)
{
- RT_NOREF1(pDisplay);
+ RT_NOREF(pDisplay);
LogRel(("VBoxClient: a fatal guest X Window error occurred. This may just mean that the Window system was shut down while the client was still running.\n"));
VBClCleanUp();
return 0; /* We should never reach this. */
diff --git a/src/VBox/Additions/x11/VBoxClient/seamless.cpp b/src/VBox/Additions/x11/VBoxClient/seamless.cpp
index e50d2893c3..4dcfed2877 100644
--- a/src/VBox/Additions/x11/VBoxClient/seamless.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/seamless.cpp
@@ -190,7 +190,7 @@ int SeamlessMain::nextStateChangeEvent(void)
*/
int SeamlessMain::x11MonitorThread(RTTHREAD hThreadSelf, void *pvUser)
{
- RT_NOREF1(hThreadSelf);
+ RT_NOREF(hThreadSelf);
SeamlessMain *pHost = (SeamlessMain *)pvUser;
int rc = VINF_SUCCESS;
@@ -302,7 +302,7 @@ static int init(struct VBCLSERVICE **ppInterface)
static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
{
- RT_NOREF1(fDaemonised);
+ RT_NOREF(fDaemonised);
struct SEAMLESSSERVICE *pSelf = getClassFromInterface(ppInterface);
int rc;
diff --git a/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp b/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp
index 3fb34adcd4..970d576b01 100644
--- a/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp
@@ -61,7 +61,7 @@ Display *XOpenDisplay(const char *display_name)
extern "C" int XCloseDisplay(Display *display);
int XCloseDisplay(Display *display)
{
- RT_NOREF1(display);
+ RT_NOREF(display);
Assert(display == TEST_DISPLAY);
return 0;
}
@@ -105,7 +105,7 @@ int XGetWindowProperty(Display *display, Window w, Atom property,
unsigned long *bytes_after_return,
unsigned char **prop_return)
{
- RT_NOREF2(display, long_length);
+ RT_NOREF(display, long_length);
Assert(display == TEST_DISPLAY);
Atom atomType = XInternAtom (display, WM_TYPE_PROP, true);
Atom atomTypeDesktop = XInternAtom (display, WM_TYPE_DESKTOP_PROP, true);
@@ -152,7 +152,7 @@ Bool XShapeQueryExtension(Display *dpy, int *event_basep, int *error_
extern "C" int XSelectInput(Display *display, Window w, long event_mask);
int XSelectInput(Display *display, Window w, long event_mask)
{
- RT_NOREF3(display, w, event_mask);
+ RT_NOREF(display, w, event_mask);
Assert(display == TEST_DISPLAY);
return 0;
}
@@ -161,7 +161,7 @@ int XSelectInput(Display *display, Window w, long event_mask)
extern "C" void XShapeSelectInput(Display *display, Window w, unsigned long event_mask);
void XShapeSelectInput(Display *display, Window w, unsigned long event_mask)
{
- RT_NOREF3(display, w, event_mask);
+ RT_NOREF(display, w, event_mask);
Assert(display == TEST_DISPLAY);
}
@@ -284,7 +284,7 @@ static Window g_SmlsEventWindow = 0;
extern "C" int XNextEvent(Display *display, XEvent *event_return);
int XNextEvent(Display *display, XEvent *event_return)
{
- RT_NOREF1(display);
+ RT_NOREF(display);
Assert(display == TEST_DISPLAY);
event_return->xany.type = g_SmlsEventType;
event_return->xany.window = g_SmlsEventWindow;
@@ -313,7 +313,7 @@ Status XSendEvent(Display *display, Window w, Bool propagate,
extern "C" int XFlush(Display *display);
int XFlush(Display *display)
{
- RT_NOREF1(display);
+ RT_NOREF(display);
Assert(display == TEST_DISPLAY);
AssertFailedReturn(0);
}
@@ -324,7 +324,7 @@ static bool g_fNotified = false;
/** Dummy host call-back. */
static void sendRegionUpdate(RTRECT *pRects, size_t cRects)
{
- RT_NOREF2(pRects, cRects);
+ RT_NOREF(pRects, cRects);
g_fNotified = true;
}
diff --git a/src/VBox/Debugger/DBGCBuiltInSymbols.cpp b/src/VBox/Debugger/DBGCBuiltInSymbols.cpp
index 51b904aecf..9fdc145497 100644
--- a/src/VBox/Debugger/DBGCBuiltInSymbols.cpp
+++ b/src/VBox/Debugger/DBGCBuiltInSymbols.cpp
@@ -35,7 +35,7 @@
PCDBGCSYM dbgcLookupRegisterSymbol(PDBGC pDbgc, const char *pszSymbol)
{
/** @todo externally registered symbols. */
- RT_NOREF2(pDbgc, pszSymbol);
+ RT_NOREF(pDbgc, pszSymbol);
return NULL;
}
diff --git a/src/VBox/Debugger/DBGCCommands.cpp b/src/VBox/Debugger/DBGCCommands.cpp
index c8adb0c6ea..60c278415e 100644
--- a/src/VBox/Debugger/DBGCCommands.cpp
+++ b/src/VBox/Debugger/DBGCCommands.cpp
@@ -590,7 +590,7 @@ static void dbgcPrintHelpFunction(PDBGCCMDHLP pCmdHlp, PCDBGCFUNC pFunc, bool fE
static void dbgcCmdHelpCommandsWorker(PDBGC pDbgc, PDBGCCMDHLP pCmdHlp, PCDBGCCMD paCmds, uint32_t cCmds, bool fExternal,
const char *pszDescFmt, ...)
{
- RT_NOREF1(pDbgc);
+ RT_NOREF(pDbgc);
if (pszDescFmt)
{
va_list va;
@@ -629,7 +629,7 @@ static void dbgcCmdHelpCommands(PDBGC pDbgc, PDBGCCMDHLP pCmdHlp, uint32_t *pcHi
static void dbgcCmdHelpFunctionsWorker(PDBGC pDbgc, PDBGCCMDHLP pCmdHlp, PCDBGCFUNC paFuncs, size_t cFuncs, bool fExternal,
const char *pszDescFmt, ...)
{
- RT_NOREF1(pDbgc);
+ RT_NOREF(pDbgc);
if (pszDescFmt)
{
va_list va;
@@ -669,7 +669,7 @@ static void dbgcCmdHelpFunctions(PDBGC pDbgc, PDBGCCMDHLP pCmdHlp, uint32_t *pcH
static void dbgcCmdHelpOperators(PDBGC pDbgc, PDBGCCMDHLP pCmdHlp, uint32_t *pcHits)
{
- RT_NOREF1(pDbgc);
+ RT_NOREF(pDbgc);
DBGCCmdHlpPrintf(pCmdHlp, !*pcHits ? "Operators:\n" : "\nOperators:\n");
*pcHits += 1;
@@ -708,7 +708,7 @@ static void dbgcCmdHelpAll(PDBGC pDbgc, PDBGCCMDHLP pCmdHlp, uint32_t *pcHits)
static void dbgcCmdHelpSummary(PDBGC pDbgc, PDBGCCMDHLP pCmdHlp, uint32_t *pcHits)
{
- RT_NOREF1(pDbgc);
+ RT_NOREF(pDbgc);
*pcHits += 1;
DBGCCmdHlpPrintf(pCmdHlp,
"\n"
diff --git a/src/VBox/Debugger/DBGCEmulateCodeView.cpp b/src/VBox/Debugger/DBGCEmulateCodeView.cpp
index 14948ac417..d2579da739 100644
--- a/src/VBox/Debugger/DBGCEmulateCodeView.cpp
+++ b/src/VBox/Debugger/DBGCEmulateCodeView.cpp
@@ -1681,7 +1681,7 @@ static int dbgcCmdUnassembleCfgDumpCalcDimensions(DBGFFLOWIT hFlowIt, DBGFFLOWBR
PDBGCFLOWBBDUMP paDumpBb, PDBGCFLOWBRANCHTBLDUMP paDumpBranchTbl,
uint32_t cBbs, uint32_t cBranchTbls)
{
- RT_NOREF2(cBbs, cBranchTbls);
+ RT_NOREF(cBbs, cBranchTbls);
/* Calculate the sizes of each basic block first. */
DBGFFLOWBB hFlowBb = DBGFR3FlowItNext(hFlowIt);
@@ -5634,7 +5634,7 @@ void dbgcEventTerm(PDBGC pDbgc)
static void dbgcEventDisplay(PDBGCCMDHLP pCmdHlp, const char *pszName, DBGCEVTSTATE enmDefault, PDBGCEVTCFG const *ppEvtCfg)
{
- RT_NOREF1(enmDefault);
+ RT_NOREF(enmDefault);
PDBGCEVTCFG pEvtCfg = *ppEvtCfg;
const char *pszState;
diff --git a/src/VBox/Debugger/DBGCEval.cpp b/src/VBox/Debugger/DBGCEval.cpp
index 950543401b..20cf5402fa 100644
--- a/src/VBox/Debugger/DBGCEval.cpp
+++ b/src/VBox/Debugger/DBGCEval.cpp
@@ -419,7 +419,7 @@ static int dbgcEvalSubUnaryAny(PDBGC pDbgc, char *pszExpr, size_t cchExpr, PDBGC
static int dbgcEvalSubCall(PDBGC pDbgc, char *pszFuncNm, size_t cchFuncNm, bool fExternal, char *pszArgs, size_t cchArgs,
DBGCVARCAT enmCategory, PDBGCVAR pResult)
{
- RT_NOREF1(enmCategory);
+ RT_NOREF(enmCategory);
/*
* Lookup the function.
@@ -1056,7 +1056,7 @@ static int dbgcProcessArguments(PDBGC pDbgc, const char *pszCmdOrFunc,
PCDBGCVARDESC const paVarDescs, uint32_t const cVarDescs,
char *pszArgs, unsigned *piArg, unsigned *pcArgs)
{
- RT_NOREF1(pszCmdOrFunc);
+ RT_NOREF(pszCmdOrFunc);
Log2(("dbgcProcessArguments: pszCmdOrFunc=%s pszArgs='%s'\n", pszCmdOrFunc, pszArgs));
/*
diff --git a/src/VBox/Debugger/DBGPlugInDarwin.cpp b/src/VBox/Debugger/DBGPlugInDarwin.cpp
index 0c3492d6e9..7f08871591 100644
--- a/src/VBox/Debugger/DBGPlugInDarwin.cpp
+++ b/src/VBox/Debugger/DBGPlugInDarwin.cpp
@@ -414,7 +414,7 @@ static bool dbgDiggerDarwinIsValidSegOrSectName(const char *pszName, size_t cbNa
static int dbgDiggerDarwinAddModule(PDBGDIGGERDARWIN pThis, PUVM pUVM, uint64_t uModAddr, const char *pszName, bool *pf64Bit)
{
- RT_NOREF1(pThis);
+ RT_NOREF(pThis);
union
{
uint8_t ab[2 * X86_PAGE_4K_SIZE];
diff --git a/src/VBox/Debugger/DBGPlugInLinux.cpp b/src/VBox/Debugger/DBGPlugInLinux.cpp
index c1c484b852..640e51b49f 100644
--- a/src/VBox/Debugger/DBGPlugInLinux.cpp
+++ b/src/VBox/Debugger/DBGPlugInLinux.cpp
@@ -661,7 +661,7 @@ static int dbgDiggerLinuxLogBufferQueryAscii(PDBGDIGGERLINUX pThis, PUVM pUVM, R
uint32_t fFlags, uint32_t cMessages,
char *pszBuf, size_t cbBuf, size_t *pcbActual)
{
- RT_NOREF2(fFlags, cMessages);
+ RT_NOREF(fFlags, cMessages);
int rc = VINF_SUCCESS;
RTGCPTR GCPtrLogBuf;
uint32_t cbLogBuf;
@@ -775,7 +775,7 @@ static int dbgDiggerLinuxLogBufferQueryRecords(PDBGDIGGERLINUX pThis, PUVM pUVM,
uint32_t fFlags, uint32_t cMessages,
char *pszBuf, size_t cbBuf, size_t *pcbActual)
{
- RT_NOREF1(fFlags);
+ RT_NOREF(fFlags);
int rc = VINF_SUCCESS;
RTGCPTR GCPtrLogBuf;
uint32_t cbLogBuf;
diff --git a/src/VBox/Debugger/DBGPlugInSolaris.cpp b/src/VBox/Debugger/DBGPlugInSolaris.cpp
index 13ace489c3..1eb8d397f3 100644
--- a/src/VBox/Debugger/DBGPlugInSolaris.cpp
+++ b/src/VBox/Debugger/DBGPlugInSolaris.cpp
@@ -430,7 +430,7 @@ static DECLCALLBACK(int) dbgDiggerSolarisQueryVersion(PUVM pUVM, void *pvData,
*/
static void dbgDiggerSolarisProcessModCtl32(PUVM pUVM, PDBGDIGGERSOLARIS pThis, SOL_modctl_t const *pModCtl)
{
- RT_NOREF1(pThis);
+ RT_NOREF(pThis);
/* skip it if it's not loaded and installed */
AssertCompile2MemberOffsets(SOL_modctl_t, v11_32.mod_loaded, v9_32.mod_loaded);
@@ -579,7 +579,7 @@ static void dbgDiggerSolarisProcessModCtl32(PUVM pUVM, PDBGDIGGERSOLARIS pThis,
*/
static void dbgDiggerSolarisProcessModCtl64(PUVM pUVM, PDBGDIGGERSOLARIS pThis, SOL_modctl_t const *pModCtl)
{
- RT_NOREF1(pThis);
+ RT_NOREF(pThis);
/* skip it if it's not loaded and installed */
AssertCompile2MemberOffsets(SOL_modctl_t, v11_64.mod_loaded, v9_64.mod_loaded);
diff --git a/src/VBox/Devices/EFI/DevSmc.cpp b/src/VBox/Devices/EFI/DevSmc.cpp
index 50eed57ba6..fd190507bd 100644
--- a/src/VBox/Devices/EFI/DevSmc.cpp
+++ b/src/VBox/Devices/EFI/DevSmc.cpp
@@ -581,7 +581,7 @@ static int getSmcKeyOs(char *pabKey, uint32_t cbKey)
/** @callback_method_impl{DEVSMCKEYGETTER, OSK0 and OSK1} */
static uint8_t scmKeyGetOSKs(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
{
- RT_NOREF1(bCmd);
+ RT_NOREF(bCmd);
Assert(SMC4CH_EQ(&pKeyDesc->Key, "OSK0") || SMC4CH_EQ(&pKeyDesc->Key, "OSK1"));
const char *pszSrc = pThis->szOsk0And1;
if (SMC4CH_EQ(&pKeyDesc->Key, "OSK1"))
@@ -594,7 +594,7 @@ static uint8_t scmKeyGetOSKs(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd,
/** @callback_method_impl{DEVSMCKEYGETTER, \#KEY} */
static uint8_t scmKeyGetKeyCount(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
{
- RT_NOREF3(pThis, bCmd, pKeyDesc);
+ RT_NOREF(pThis, bCmd, pKeyDesc);
Assert(pKeyDesc == &g_aSmcKeys[SMC_KEYIDX_FIRST_ENUM]);
uint32_t cKeys = RT_ELEMENTS(g_aSmcKeys) - SMC_KEYIDX_FIRST_ENUM;
pCurKey->Value.u32 = RT_H2BE_U32(cKeys);
@@ -605,7 +605,7 @@ static uint8_t scmKeyGetKeyCount(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t b
/** @callback_method_impl{DEVSMCKEYGETTER, REV - Source revision.} */
static uint8_t scmKeyGetRevision(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
{
- RT_NOREF3(pThis, bCmd, pKeyDesc);
+ RT_NOREF(pThis, bCmd, pKeyDesc);
#ifdef VBOX_WITH_SMC_2_x
pCurKey->Value.ab[0] = 0x02;
pCurKey->Value.ab[1] = 0x03;
@@ -629,7 +629,7 @@ static uint8_t scmKeyGetRevision(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t b
/** @callback_method_impl{DEVSMCKEYGETTER, $Adr - SMC address.} */
static uint8_t scmKeyGetDollarAddress(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
{
- RT_NOREF3(pThis, bCmd, pKeyDesc);
+ RT_NOREF(pThis, bCmd, pKeyDesc);
pCurKey->Value.u32 = RT_H2BE_U32(SMC_PORT_FIRST);
return VINF_SUCCESS;
}
@@ -638,7 +638,7 @@ static uint8_t scmKeyGetDollarAddress(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint
/** @callback_method_impl{DEVSMCKEYGETTER, $Num - Some kind of number.} */
static uint8_t scmKeyGetDollarNumber(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
{
- RT_NOREF2(bCmd, pKeyDesc);
+ RT_NOREF(bCmd, pKeyDesc);
pCurKey->Value.ab[0] = pThis->bDollaryNumber;
return VINF_SUCCESS;
}
@@ -646,7 +646,7 @@ static uint8_t scmKeyGetDollarNumber(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8
/** @callback_method_impl{DEVSMCKEYPUTTER, $Num - Some kind of number.} */
static uint8_t scmKeyPutDollarNumber(PDEVSMC pThis, PCDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
{
- RT_NOREF2(bCmd, pKeyDesc);
+ RT_NOREF(bCmd, pKeyDesc);
Log(("scmKeyPutDollarNumber: %#x -> %#x\n", pThis->bDollaryNumber, pCurKey->Value.ab[0]));
pThis->bDollaryNumber = pCurKey->Value.ab[0];
return VINF_SUCCESS;
@@ -657,7 +657,7 @@ static uint8_t scmKeyPutDollarNumber(PDEVSMC pThis, PCDEVSMCCURKEY pCurKey, uint
/** @callback_method_impl{DEVSMCKEYGETTER, MSSD - Machine Shutdown reason.} */
static uint8_t scmKeyGetShutdownReason(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
{
- RT_NOREF2(bCmd, pKeyDesc);
+ RT_NOREF(bCmd, pKeyDesc);
pCurKey->Value.ab[0] = pThis->bShutdownReason;
return SMC_STATUS_CD_SUCCESS;
}
@@ -666,7 +666,7 @@ static uint8_t scmKeyGetShutdownReason(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uin
/** @callback_method_impl{DEVSMCKEYPUTTER, MSSD - Machine Shutdown reason.} */
static uint8_t scmKeyPutShutdownReason(PDEVSMC pThis, PCDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
{
- RT_NOREF2(bCmd, pKeyDesc);
+ RT_NOREF(bCmd, pKeyDesc);
Log(("scmKeyPutShutdownReason: %#x -> %#x\n", pThis->bShutdownReason, pCurKey->Value.ab[0]));
pThis->bShutdownReason = pCurKey->Value.ab[0];
return SMC_STATUS_CD_SUCCESS;
@@ -676,7 +676,7 @@ static uint8_t scmKeyPutShutdownReason(PDEVSMC pThis, PCDEVSMCCURKEY pCurKey, ui
/** @callback_method_impl{DEVSMCKEYGETTER, MSSD - Ninja timer action job.} */
static uint8_t scmKeyGetNinjaTimerAction(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
{
- RT_NOREF2(bCmd, pKeyDesc);
+ RT_NOREF(bCmd, pKeyDesc);
pCurKey->Value.ab[0] = pThis->bNinjaActionTimerJob;
return SMC_STATUS_CD_SUCCESS;
}
@@ -685,7 +685,7 @@ static uint8_t scmKeyGetNinjaTimerAction(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, u
/** @callback_method_impl{DEVSMCKEYPUTTER, NATJ - Ninja timer action job.} */
static uint8_t scmKeyPutNinjaTimerAction(PDEVSMC pThis, PCDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
{
- RT_NOREF2(bCmd, pKeyDesc);
+ RT_NOREF(bCmd, pKeyDesc);
Log(("scmKeyPutNinjaTimerAction: %#x -> %#x\n", pThis->bNinjaActionTimerJob, pCurKey->Value.ab[0]));
pThis->bNinjaActionTimerJob = pCurKey->Value.ab[0];
return SMC_STATUS_CD_SUCCESS;
@@ -696,7 +696,7 @@ static uint8_t scmKeyPutNinjaTimerAction(PDEVSMC pThis, PCDEVSMCCURKEY pCurKey,
/** @callback_method_impl{DEVSMCKEYGETTER, Generic one getter.} */
static uint8_t scmKeyGetOne(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
{
- RT_NOREF2(pThis, bCmd);
+ RT_NOREF(pThis, bCmd);
memset(&pCurKey->Value.ab[0], 0, pKeyDesc->cbValue);
pCurKey->Value.ab[pKeyDesc->cbValue - 1] = 1;
return SMC_STATUS_CD_SUCCESS;
@@ -707,7 +707,7 @@ static uint8_t scmKeyGetOne(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd,
/** @callback_method_impl{DEVSMCKEYGETTER, Generic zero getter.} */
static uint8_t scmKeyGetZero(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
{
- RT_NOREF2(pThis, bCmd);
+ RT_NOREF(pThis, bCmd);
memset(&pCurKey->Value.ab[0], 0, pKeyDesc->cbValue);
return SMC_STATUS_CD_SUCCESS;
}
@@ -861,13 +861,13 @@ static uint8_t smcKeyGetAttrByName(PDEVSMC pThis)
static uint8_t smcKeyPutPrepare(PDEVSMC pThis)
{
- RT_NOREF1(pThis);
+ RT_NOREF(pThis);
return 0;
}
static uint8_t smcKeyPutValue(PDEVSMC pThis)
{
- RT_NOREF1(pThis);
+ RT_NOREF(pThis);
return 0;
}
@@ -881,7 +881,7 @@ static uint8_t smcKeyPutValue(PDEVSMC pThis)
*/
static int smcRegData_r(PDEVSMC pThis, uint8_t uReg, uint8_t *pbValue)
{
- RT_NOREF1(uReg);
+ RT_NOREF(uReg);
switch (pThis->bCmd)
{
case SMC_CMD_GET_KEY_VALUE:
@@ -971,7 +971,7 @@ static int smcRegData_r(PDEVSMC pThis, uint8_t uReg, uint8_t *pbValue)
*/
static int smcRegData_w(PDEVSMC pThis, uint8_t uReg, uint8_t bValue)
{
- RT_NOREF1(uReg);
+ RT_NOREF(uReg);
switch (pThis->bCmd)
{
/*
@@ -1157,7 +1157,7 @@ static int smcRegGen_r(PDEVSMC pThis, uint8_t uReg, uint8_t *pbValue)
*/
static int smcRegFF_w(PDEVSMC pThis, uint8_t uReg, uint8_t bValue)
{
- RT_NOREF3(pThis, uReg, bValue);
+ RT_NOREF(pThis, uReg, bValue);
Log(("SMC: %#04x: Writing %#x to unknown register!\n", uReg, bValue));
return VINF_SUCCESS;
}
@@ -1172,7 +1172,7 @@ static int smcRegFF_w(PDEVSMC pThis, uint8_t uReg, uint8_t bValue)
*/
static int smcRegFF_r(PDEVSMC pThis, uint8_t uReg, uint8_t *pbValue)
{
- RT_NOREF2(pThis, uReg);
+ RT_NOREF(pThis, uReg);
Log(("SMC: %#04x: Reading from unknown register!\n", uReg));
*pbValue = 0xff;
return VINF_SUCCESS;
diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp
index 10f8320247..1d0d1bb9b6 100644
--- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp
+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp
@@ -1890,7 +1890,7 @@ static int vmsvga3dInfoBmpWrite(const char *pszFilename, const void *pvBits, int
return VINF_SUCCESS;
#else /* !RT_OS_WINDOWS */
- RT_NOREF6(pszFilename, pvBits, w, h, cbPixel, u32Mask);
+ RT_NOREF(pszFilename, pvBits, w, h, cbPixel, u32Mask);
return VERR_NOT_SUPPORTED;
#endif
}
diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp
index d5d50234b1..4ff5420696 100644
--- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp
+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp
@@ -2170,7 +2170,7 @@ int vmsvga3dBackSurfaceStretchBlt(PVGASTATE pThis, PVMSVGA3DSTATE pState,
SVGA3dStretchBltMode enmMode, PVMSVGA3DCONTEXT pContext)
{
RT_NOREF(pThis);
- RT_NOREF2(uDstFace, uSrcFace); /// @todo
+ RT_NOREF(uDstFace, uSrcFace); /// @todo
/* Activate the read and draw framebuffer objects. */
pState->ext.glBindFramebuffer(GL_READ_FRAMEBUFFER, pContext->idReadFramebuffer);
diff --git a/src/VBox/Devices/Graphics/DevVGA.cpp b/src/VBox/Devices/Graphics/DevVGA.cpp
index f6ff310e81..332b2e9136 100644
--- a/src/VBox/Devices/Graphics/DevVGA.cpp
+++ b/src/VBox/Devices/Graphics/DevVGA.cpp
@@ -2275,7 +2275,7 @@ int vgaR3UpdateDisplay(VGAState *s, unsigned xStart, unsigned yStart, unsigned c
static int vmsvga_draw_graphic(PVGASTATE pThis, bool fFullUpdate, bool fFailOnResize, bool reset_dirty,
PDMIDISPLAYCONNECTOR *pDrv)
{
- RT_NOREF1(fFailOnResize);
+ RT_NOREF(fFailOnResize);
uint32_t const cx = pThis->svga.uWidth;
uint32_t const cxDisplay = cx;
@@ -3586,7 +3586,7 @@ static int vgaLFBAccess(PVM pVM, PVGASTATE pThis, RTGCPHYS GCPhys, RTGCPTR GCPtr
#else /* IN_RING3 : We don't have any virtual page address of the access here. */
PDMCritSectLeave(&pThis->CritSect);
Assert(GCPtr == 0);
- RT_NOREF1(GCPtr);
+ RT_NOREF(GCPtr);
#endif
return VINF_SUCCESS;
}
diff --git a/src/VBox/Devices/Input/PS2K.cpp b/src/VBox/Devices/Input/PS2K.cpp
index 3264afe28f..055731a7b3 100644
--- a/src/VBox/Devices/Input/PS2K.cpp
+++ b/src/VBox/Devices/Input/PS2K.cpp
@@ -1349,7 +1349,7 @@ int PS2KLoadState(PPS2K pThis, PSSMHANDLE pSSM, uint32_t uVersion)
int PS2KLoadDone(PPS2K pThis, PSSMHANDLE pSSM)
{
- RT_NOREF1(pSSM);
+ RT_NOREF(pSSM);
/* This *must* be done after the inital load because it may trigger
* interrupts and change the interrupt controller state.
@@ -1382,7 +1382,7 @@ void PS2KReset(PPS2K pThis)
void PS2KRelocate(PPS2K pThis, RTGCINTPTR offDelta, PPDMDEVINS pDevIns)
{
- RT_NOREF1(pDevIns);
+ RT_NOREF(pDevIns);
LogFlowFunc(("Relocating PS2K\n"));
pThis->pKbdDelayTimerRC = TMTimerRCPtr(pThis->pKbdDelayTimerR3);
pThis->pKbdTypematicTimerRC = TMTimerRCPtr(pThis->pKbdTypematicTimerR3);
@@ -1391,7 +1391,7 @@ void PS2KRelocate(PPS2K pThis, RTGCINTPTR offDelta, PPDMDEVINS pDevIns)
int PS2KConstruct(PPS2K pThis, PPDMDEVINS pDevIns, void *pParent, int iInstance)
{
- RT_NOREF2(pDevIns, iInstance);
+ RT_NOREF(pDevIns, iInstance);
LogFlowFunc(("iInstance=%d\n", iInstance));
pThis->pParent = pParent;
diff --git a/src/VBox/Devices/Input/PS2M.cpp b/src/VBox/Devices/Input/PS2M.cpp
index b84156b017..f88b127a0c 100644
--- a/src/VBox/Devices/Input/PS2M.cpp
+++ b/src/VBox/Devices/Input/PS2M.cpp
@@ -952,7 +952,7 @@ static DECLCALLBACK(void *) ps2mQueryInterface(PPDMIBASE pInterface, const char
static int ps2mPutEventWorker(PPS2M pThis, int32_t dx, int32_t dy,
int32_t dz, int32_t dw, uint32_t fButtons)
{
- RT_NOREF1(dw);
+ RT_NOREF(dw);
int rc = VINF_SUCCESS;
/* Update internal accumulators and button state. */
@@ -1153,7 +1153,7 @@ void PS2MReset(PPS2M pThis)
void PS2MRelocate(PPS2M pThis, RTGCINTPTR offDelta, PPDMDEVINS pDevIns)
{
- RT_NOREF2(pDevIns, offDelta);
+ RT_NOREF(pDevIns, offDelta);
LogFlowFunc(("Relocating PS2M\n"));
pThis->pDelayTimerRC = TMTimerRCPtr(pThis->pDelayTimerR3);
pThis->pThrottleTimerRC = TMTimerRCPtr(pThis->pThrottleTimerR3);
@@ -1161,7 +1161,7 @@ void PS2MRelocate(PPS2M pThis, RTGCINTPTR offDelta, PPDMDEVINS pDevIns)
int PS2MConstruct(PPS2M pThis, PPDMDEVINS pDevIns, void *pParent, int iInstance)
{
- RT_NOREF1(iInstance);
+ RT_NOREF(iInstance);
LogFlowFunc(("iInstance=%d\n", iInstance));
diff --git a/src/VBox/Devices/Input/UsbKbd.cpp b/src/VBox/Devices/Input/UsbKbd.cpp
index 0f70f489f8..88d3959ab4 100644
--- a/src/VBox/Devices/Input/UsbKbd.cpp
+++ b/src/VBox/Devices/Input/UsbKbd.cpp
@@ -501,7 +501,7 @@ static void usbHidLinkDone(PUSBHID pThis, PVUSBURB pUrb)
*/
static int usbHidCompleteStall(PUSBHID pThis, PUSBHIDEP pEp, PVUSBURB pUrb, const char *pszWhy)
{
- RT_NOREF1(pszWhy);
+ RT_NOREF(pszWhy);
Log(("usbHidCompleteStall/#%u: pUrb=%p:%s: %s\n", pThis->pUsbIns->iInstance, pUrb, pUrb->pszDesc, pszWhy));
pUrb->enmStatus = VUSBSTATUS_STALL;
diff --git a/src/VBox/Devices/Network/DevE1000.cpp b/src/VBox/Devices/Network/DevE1000.cpp
index 9e1df55b10..d2e7f80aa2 100644
--- a/src/VBox/Devices/Network/DevE1000.cpp
+++ b/src/VBox/Devices/Network/DevE1000.cpp
@@ -1792,7 +1792,7 @@ DECLINLINE(int) e1kGetDescType(E1KTXDESC *pDesc)
*/
static void e1kPrintRDesc(PE1KSTATE pThis, E1KRXDESC *pDesc)
{
- RT_NOREF2(pThis, pDesc);
+ RT_NOREF(pThis, pDesc);
E1kLog2(("%s <-- Receive Descriptor (%d bytes):\n", pThis->szPrf, pDesc->u16Length));
E1kLog2((" Address=%16LX Length=%04X Csum=%04X\n",
pDesc->u64BufAddr, pDesc->u16Length, pDesc->u16Checksum));
@@ -4031,7 +4031,7 @@ static void e1kTransmitFrame(PE1KSTATE pThis, bool fOnWorkerThread)
*/
static void e1kInsertChecksum(PE1KSTATE pThis, uint8_t *pPkt, uint16_t u16PktLen, uint8_t cso, uint8_t css, uint16_t cse)
{
- RT_NOREF1(pThis);
+ RT_NOREF(pThis);
if (css >= u16PktLen)
{
@@ -5626,7 +5626,7 @@ static int e1kRegReadVFTA(PE1KSTATE pThis, uint32_t offset, uint32_t index, uint
*/
static int e1kRegReadUnimplemented(PE1KSTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value)
{
- RT_NOREF3(pThis, offset, index);
+ RT_NOREF(pThis, offset, index);
E1kLog(("%s At %08X read (00000000) attempt from unimplemented register %s (%s)\n",
pThis->szPrf, offset, g_aE1kRegMap[index].abbrev, g_aE1kRegMap[index].name));
*pu32Value = 0;
diff --git a/src/VBox/Devices/Network/DevE1000Phy.cpp b/src/VBox/Devices/Network/DevE1000Phy.cpp
index 162c3c9359..126f32883f 100644
--- a/src/VBox/Devices/Network/DevE1000Phy.cpp
+++ b/src/VBox/Devices/Network/DevE1000Phy.cpp
@@ -164,7 +164,7 @@ static void Phy::regWriteDefault(PPHY pPhy, uint32_t index, uint16_t u16Value)
*/
static uint16_t Phy::regReadForbidden(PPHY pPhy, uint32_t index)
{
- RT_NOREF2(pPhy, index);
+ RT_NOREF(pPhy, index);
PhyLog(("PHY#%d At %02d read attempted from write-only '%s'\n",
pPhy->iInstance, s_regMap[index].u32Address, s_regMap[index].pszName));
return 0;
diff --git a/src/VBox/Devices/Network/DevPCNet.cpp b/src/VBox/Devices/Network/DevPCNet.cpp
index 66ef0b2da0..7b4d0423e6 100644
--- a/src/VBox/Devices/Network/DevPCNet.cpp
+++ b/src/VBox/Devices/Network/DevPCNet.cpp
@@ -3363,7 +3363,7 @@ PDMBOTHCBDECL(int) pcnetIOPortAPromWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOP
static int pcnetIoportWriteU8(PPCNETSTATE pThis, uint32_t addr, uint32_t val)
{
- RT_NOREF1(val);
+ RT_NOREF(val);
#ifdef PCNET_DEBUG_IO
Log2(("#%d pcnetIoportWriteU8: addr=%#010x val=%#06x\n", PCNET_INST_NR, addr, val));
#endif
diff --git a/src/VBox/Devices/Network/SrvIntNetR0.cpp b/src/VBox/Devices/Network/SrvIntNetR0.cpp
index d45f59cff8..6b15eeb461 100644
--- a/src/VBox/Devices/Network/SrvIntNetR0.cpp
+++ b/src/VBox/Devices/Network/SrvIntNetR0.cpp
@@ -1136,7 +1136,7 @@ static void intnetR0IfAddrCacheDeleteIt(PINTNETIF pIf, PINTNETADDRCACHE pCache,
break;
}
#else
- RT_NOREF2(pIf, pszMsg);
+ RT_NOREF(pIf, pszMsg);
#endif
pCache->cEntries--;
@@ -1485,7 +1485,7 @@ static void intnetR0IfAddrCacheAddIt(PINTNETIF pIf, INTNETADDRTYPE enmAddrType,
break;
}
#else
- RT_NOREF1(pszMsg);
+ RT_NOREF(pszMsg);
#endif
pCache->cEntries++;
Assert(pCache->cEntries <= pCache->cEntriesAlloc);
diff --git a/src/VBox/Devices/Network/slirp/ip_icmpwin.c b/src/VBox/Devices/Network/slirp/ip_icmpwin.c
index d4c06ee0b2..dac2c47676 100644
--- a/src/VBox/Devices/Network/slirp/ip_icmpwin.c
+++ b/src/VBox/Devices/Network/slirp/ip_icmpwin.c
@@ -252,7 +252,7 @@ icmpwin_callback_apc(void *ctx, PIO_STATUS_BLOCK iob, ULONG reserved)
struct pong *pong = (struct pong *)ctx;
if (pong != NULL)
icmpwin_callback(pong);
- RT_NOREF2(iob, reserved);
+ RT_NOREF(iob, reserved);
}
diff --git a/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp b/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp
index 4936143dd9..fb2f0fb1ad 100644
--- a/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp
+++ b/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp
@@ -395,7 +395,7 @@ int acpiCleanupDsdt(PPDMDEVINS pDevIns, void *pvPtr)
#ifdef VBOX_WITH_DYNAMIC_DSDT
return cleanupDynamicDsdt(pDevIns, pvPtr);
#else
- RT_NOREF1(pDevIns);
+ RT_NOREF(pDevIns);
if (pvPtr)
RTMemFree(pvPtr);
return VINF_SUCCESS;
@@ -458,7 +458,7 @@ int acpiPrepareSsdt(PPDMDEVINS pDevIns, void **ppvPtr, size_t *pcbSsdt)
/** No docs, lazy coder. */
int acpiCleanupSsdt(PPDMDEVINS pDevIns, void *pvPtr)
{
- RT_NOREF1(pDevIns);
+ RT_NOREF(pDevIns);
if (pvPtr)
RTMemFree(pvPtr);
return VINF_SUCCESS;
diff --git a/src/VBox/Devices/PC/DevFwCommon.cpp b/src/VBox/Devices/PC/DevFwCommon.cpp
index 6f1002af29..034ee0ce81 100644
--- a/src/VBox/Devices/PC/DevFwCommon.cpp
+++ b/src/VBox/Devices/PC/DevFwCommon.cpp
@@ -1030,7 +1030,7 @@ void FwCommonPlantSmbiosAndDmiHdrs(PPDMDEVINS pDevIns, uint16_t cbDmiTables, uin
*/
void FwCommonPlantMpsTable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, uint16_t cCpus)
{
- RT_NOREF1(cbMax);
+ RT_NOREF(cbMax);
/* configuration table */
PMPSCFGTBLHEADER pCfgTab = (MPSCFGTBLHEADER*)pTable;
diff --git a/src/VBox/Devices/PC/DevLPC.cpp b/src/VBox/Devices/PC/DevLPC.cpp
index 16bce9c841..d89eeb7bbe 100644
--- a/src/VBox/Devices/PC/DevLPC.cpp
+++ b/src/VBox/Devices/PC/DevLPC.cpp
@@ -87,7 +87,7 @@ typedef struct
static uint32_t rcba_ram_readl(LPCState* s, RTGCPHYS addr)
{
- RT_NOREF1(s);
+ RT_NOREF(s);
Log(("rcba_read at %llx\n", (uint64_t)addr));
int32_t iIndex = (addr - RCBA_BASE);
uint32_t value = 0;
@@ -114,7 +114,7 @@ static uint32_t rcba_ram_readl(LPCState* s, RTGCPHYS addr)
static void rcba_ram_writel(LPCState* s, RTGCPHYS addr, uint32_t value)
{
- RT_NOREF2(s, value);
+ RT_NOREF(s, value);
Log(("rcba_write %llx = %#x\n", (uint64_t)addr, value));
int32_t iIndex = (addr - RCBA_BASE);
diff --git a/src/VBox/Devices/PC/DevPcBios.cpp b/src/VBox/Devices/PC/DevPcBios.cpp
index 3b6cf91d01..4a3ad2b61b 100644
--- a/src/VBox/Devices/PC/DevPcBios.cpp
+++ b/src/VBox/Devices/PC/DevPcBios.cpp
@@ -570,7 +570,7 @@ static void pcbiosCmosInitHardDisk(PPDMDEVINS pDevIns, int offType, int offInfo,
*/
static int setLogicalDiskGeometry(PPDMIBASE pBase, PPDMIMEDIA pHardDisk, PPDMMEDIAGEOMETRY pLCHSGeometry)
{
- RT_NOREF1(pBase);
+ RT_NOREF(pBase);
PDMMEDIAGEOMETRY LCHSGeometry;
int rc = pHardDisk->pfnBiosGetLCHSGeometry(pHardDisk, &LCHSGeometry);
diff --git a/src/VBox/Devices/Storage/DevAHCI.cpp b/src/VBox/Devices/Storage/DevAHCI.cpp
index 7f08342156..1688d356a0 100644
--- a/src/VBox/Devices/Storage/DevAHCI.cpp
+++ b/src/VBox/Devices/Storage/DevAHCI.cpp
@@ -1036,7 +1036,7 @@ static void ahciIoThreadKick(PAHCI pAhci, PAHCIPort pAhciPort)
static int PortCmdIssue_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
ahciLog(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
/* Update the CI register first. */
@@ -1070,7 +1070,7 @@ static int PortCmdIssue_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint3
static int PortCmdIssue_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
uint32_t uCIValue = ASMAtomicXchgU32(&pAhciPort->u32TasksFinished, 0);
ahciLog(("%s: read regCI=%#010x uCIValue=%#010x\n", __FUNCTION__, pAhciPort->regCI, uCIValue));
@@ -1083,7 +1083,7 @@ static int PortCmdIssue_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint3
static int PortSActive_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
pAhciPort->regSACT |= u32Value;
@@ -1093,7 +1093,7 @@ static int PortSActive_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32
static int PortSActive_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
uint32_t u32TasksFinished = ASMAtomicXchgU32(&pAhciPort->u32QueuedTasksFinished, 0);
pAhciPort->regSACT &= ~u32TasksFinished;
@@ -1108,7 +1108,7 @@ static int PortSActive_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32
static int PortSError_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
if ( (u32Value & AHCI_PORT_SERR_X)
@@ -1130,7 +1130,7 @@ static int PortSError_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_
static int PortSError_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: read regSERR=%#010x\n", __FUNCTION__, pAhciPort->regSERR));
*pu32Value = pAhciPort->regSERR;
return VINF_SUCCESS;
@@ -1138,13 +1138,13 @@ static int PortSError_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_
static int PortSControl_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
ahciLog(("%s: IPM=%d SPD=%d DET=%d\n", __FUNCTION__,
AHCI_PORT_SCTL_IPM_GET(u32Value), AHCI_PORT_SCTL_SPD_GET(u32Value), AHCI_PORT_SCTL_DET_GET(u32Value)));
#ifndef IN_RING3
- RT_NOREF2(pAhciPort, u32Value);
+ RT_NOREF(pAhciPort, u32Value);
return VINF_IOM_R3_MMIO_WRITE;
#else
if ((u32Value & AHCI_PORT_SCTL_DET) == AHCI_PORT_SCTL_DET_INIT)
@@ -1187,7 +1187,7 @@ static int PortSControl_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint3
static int PortSControl_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: read regSCTL=%#010x\n", __FUNCTION__, pAhciPort->regSCTL));
ahciLog(("%s: IPM=%d SPD=%d DET=%d\n", __FUNCTION__,
AHCI_PORT_SCTL_IPM_GET(pAhciPort->regSCTL), AHCI_PORT_SCTL_SPD_GET(pAhciPort->regSCTL),
@@ -1199,7 +1199,7 @@ static int PortSControl_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint3
static int PortSStatus_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: read regSSTS=%#010x\n", __FUNCTION__, pAhciPort->regSSTS));
ahciLog(("%s: IPM=%d SPD=%d DET=%d\n", __FUNCTION__,
AHCI_PORT_SSTS_IPM_GET(pAhciPort->regSSTS), AHCI_PORT_SSTS_SPD_GET(pAhciPort->regSSTS),
@@ -1211,7 +1211,7 @@ static int PortSStatus_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32
static int PortSignature_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: read regSIG=%#010x\n", __FUNCTION__, pAhciPort->regSIG));
*pu32Value = pAhciPort->regSIG;
return VINF_SUCCESS;
@@ -1219,7 +1219,7 @@ static int PortSignature_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint
static int PortTaskFileData_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: read regTFD=%#010x\n", __FUNCTION__, pAhciPort->regTFD));
ahciLog(("%s: ERR=%x BSY=%d DRQ=%d ERR=%d\n", __FUNCTION__,
(pAhciPort->regTFD >> 8), (pAhciPort->regTFD & AHCI_PORT_TFD_BSY) >> 7,
@@ -1233,7 +1233,7 @@ static int PortTaskFileData_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, u
*/
static int PortCmd_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: read regCMD=%#010x\n", __FUNCTION__, pAhciPort->regCMD | AHCI_PORT_CMD_CCS_SHIFT(pAhciPort->u32CurrentCommandSlot)));
ahciLog(("%s: ICC=%d ASP=%d ALPE=%d DLAE=%d ATAPI=%d CPD=%d ISP=%d HPCP=%d PMA=%d CPS=%d CR=%d FR=%d ISS=%d CCS=%d FRE=%d CLO=%d POD=%d SUD=%d ST=%d\n",
__FUNCTION__, (pAhciPort->regCMD & AHCI_PORT_CMD_ICC) >> 28, (pAhciPort->regCMD & AHCI_PORT_CMD_ASP) >> 27,
@@ -1256,7 +1256,7 @@ static int PortCmd_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *
*/
static int PortCmd_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
ahciLog(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
ahciLog(("%s: ICC=%d ASP=%d ALPE=%d DLAE=%d ATAPI=%d CPD=%d ISP=%d HPCP=%d PMA=%d CPS=%d CR=%d FR=%d ISS=%d CCS=%d FRE=%d CLO=%d POD=%d SUD=%d ST=%d\n",
__FUNCTION__, (u32Value & AHCI_PORT_CMD_ICC) >> 28, (u32Value & AHCI_PORT_CMD_ASP) >> 27,
@@ -1412,7 +1412,7 @@ static int PortCmd_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t u
*/
static int PortIntrEnable_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: read regIE=%#010x\n", __FUNCTION__, pAhciPort->regIE));
ahciLog(("%s: CPDE=%d TFEE=%d HBFE=%d HBDE=%d IFE=%d INFE=%d OFE=%d IPME=%d PRCE=%d DIE=%d PCE=%d DPE=%d UFE=%d SDBE=%d DSE=%d PSE=%d DHRE=%d\n",
__FUNCTION__, (pAhciPort->regIE & AHCI_PORT_IE_CPDE) >> 31, (pAhciPort->regIE & AHCI_PORT_IE_TFEE) >> 30,
@@ -1433,7 +1433,7 @@ static int PortIntrEnable_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uin
*/
static int PortIntrEnable_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
ahciLog(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
ahciLog(("%s: CPDE=%d TFEE=%d HBFE=%d HBDE=%d IFE=%d INFE=%d OFE=%d IPME=%d PRCE=%d DIE=%d PCE=%d DPE=%d UFE=%d SDBE=%d DSE=%d PSE=%d DHRE=%d\n",
__FUNCTION__, (u32Value & AHCI_PORT_IE_CPDE) >> 31, (u32Value & AHCI_PORT_IE_TFEE) >> 30,
@@ -1466,7 +1466,7 @@ static int PortIntrEnable_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uin
*/
static int PortIntrSts_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: read regIS=%#010x\n", __FUNCTION__, pAhciPort->regIS));
ahciLog(("%s: CPDS=%d TFES=%d HBFS=%d HBDS=%d IFS=%d INFS=%d OFS=%d IPMS=%d PRCS=%d DIS=%d PCS=%d DPS=%d UFS=%d SDBS=%d DSS=%d PSS=%d DHRS=%d\n",
__FUNCTION__, (pAhciPort->regIS & AHCI_PORT_IS_CPDS) >> 31, (pAhciPort->regIS & AHCI_PORT_IS_TFES) >> 30,
@@ -1487,7 +1487,7 @@ static int PortIntrSts_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32
*/
static int PortIntrSts_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
ASMAtomicAndU32(&pAhciPort->regIS, ~(u32Value & AHCI_PORT_IS_READONLY));
@@ -1499,7 +1499,7 @@ static int PortIntrSts_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32
*/
static int PortFisAddrUp_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: read regFBU=%#010x\n", __FUNCTION__, pAhciPort->regFBU));
*pu32Value = pAhciPort->regFBU;
return VINF_SUCCESS;
@@ -1510,7 +1510,7 @@ static int PortFisAddrUp_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint
*/
static int PortFisAddrUp_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
pAhciPort->regFBU = u32Value;
@@ -1524,7 +1524,7 @@ static int PortFisAddrUp_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint
*/
static int PortFisAddr_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: read regFB=%#010x\n", __FUNCTION__, pAhciPort->regFB));
*pu32Value = pAhciPort->regFB;
return VINF_SUCCESS;
@@ -1535,7 +1535,7 @@ static int PortFisAddr_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32
*/
static int PortFisAddr_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
Assert(!(u32Value & ~AHCI_PORT_FB_RESERVED));
@@ -1551,7 +1551,7 @@ static int PortFisAddr_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32
*/
static int PortCmdLstAddrUp_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
pAhciPort->regCLBU = u32Value;
@@ -1565,7 +1565,7 @@ static int PortCmdLstAddrUp_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, u
*/
static int PortCmdLstAddrUp_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: read regCLBU=%#010x\n", __FUNCTION__, pAhciPort->regCLBU));
*pu32Value = pAhciPort->regCLBU;
return VINF_SUCCESS;
@@ -1576,7 +1576,7 @@ static int PortCmdLstAddrUp_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, u
*/
static int PortCmdLstAddr_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: read regCLB=%#010x\n", __FUNCTION__, pAhciPort->regCLB));
*pu32Value = pAhciPort->regCLB;
return VINF_SUCCESS;
@@ -1587,7 +1587,7 @@ static int PortCmdLstAddr_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uin
*/
static int PortCmdLstAddr_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF2(pAhci, iReg);
+ RT_NOREF(pAhci, iReg);
ahciLog(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
Assert(!(u32Value & ~AHCI_PORT_CLB_RESERVED));
@@ -1603,7 +1603,7 @@ static int PortCmdLstAddr_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uin
*/
static int HbaVersion_r(PAHCI pAhci, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
Log(("%s: read regHbaVs=%#010x\n", __FUNCTION__, pAhci->regHbaVs));
*pu32Value = pAhci->regHbaVs;
return VINF_SUCCESS;
@@ -1614,7 +1614,7 @@ static int HbaVersion_r(PAHCI pAhci, uint32_t iReg, uint32_t *pu32Value)
*/
static int HbaPortsImplemented_r(PAHCI pAhci, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
Log(("%s: read regHbaPi=%#010x\n", __FUNCTION__, pAhci->regHbaPi));
*pu32Value = pAhci->regHbaPi;
return VINF_SUCCESS;
@@ -1625,7 +1625,7 @@ static int HbaPortsImplemented_r(PAHCI pAhci, uint32_t iReg, uint32_t *pu32Value
*/
static int HbaInterruptStatus_w(PAHCI pAhci, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
Log(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
int rc = PDMCritSectEnter(&pAhci->lock, VINF_IOM_R3_MMIO_WRITE);
@@ -1689,7 +1689,7 @@ static int HbaInterruptStatus_w(PAHCI pAhci, uint32_t iReg, uint32_t u32Value)
*/
static int HbaInterruptStatus_r(PAHCI pAhci, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
int rc = PDMCritSectEnter(&pAhci->lock, VINF_IOM_R3_MMIO_READ);
if (rc != VINF_SUCCESS)
@@ -1723,7 +1723,7 @@ static int HbaInterruptStatus_r(PAHCI pAhci, uint32_t iReg, uint32_t *pu32Value)
*/
static int HbaControl_w(PAHCI pAhci, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
Log(("%s: write u32Value=%#010x\n"
"%s: AE=%d IE=%d HR=%d\n",
__FUNCTION__, u32Value,
@@ -1731,7 +1731,7 @@ static int HbaControl_w(PAHCI pAhci, uint32_t iReg, uint32_t u32Value)
(u32Value & AHCI_HBA_CTRL_HR)));
#ifndef IN_RING3
- RT_NOREF2(pAhci, u32Value);
+ RT_NOREF(pAhci, u32Value);
return VINF_IOM_R3_MMIO_WRITE;
#else
/*
@@ -1759,7 +1759,7 @@ static int HbaControl_w(PAHCI pAhci, uint32_t iReg, uint32_t u32Value)
*/
static int HbaControl_r(PAHCI pAhci, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
Log(("%s: read regHbaCtrl=%#010x\n"
"%s: AE=%d IE=%d HR=%d\n",
__FUNCTION__, pAhci->regHbaCtrl,
@@ -1774,7 +1774,7 @@ static int HbaControl_r(PAHCI pAhci, uint32_t iReg, uint32_t *pu32Value)
*/
static int HbaCapabilities_r(PAHCI pAhci, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
Log(("%s: read regHbaCap=%#010x\n"
"%s: S64A=%d SNCQ=%d SIS=%d SSS=%d SALP=%d SAL=%d SCLO=%d ISS=%d SNZO=%d SAM=%d SPM=%d PMD=%d SSC=%d PSC=%d NCS=%d NP=%d\n",
__FUNCTION__, pAhci->regHbaCap,
@@ -1795,7 +1795,7 @@ static int HbaCapabilities_r(PAHCI pAhci, uint32_t iReg, uint32_t *pu32Value)
*/
static int HbaCccCtl_w(PAHCI pAhci, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
Log(("%s: write u32Value=%#010x\n"
"%s: TV=%d CC=%d INT=%d EN=%d\n",
__FUNCTION__, u32Value,
@@ -1820,7 +1820,7 @@ static int HbaCccCtl_w(PAHCI pAhci, uint32_t iReg, uint32_t u32Value)
*/
static int HbaCccCtl_r(PAHCI pAhci, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
Log(("%s: read regHbaCccCtl=%#010x\n"
"%s: TV=%d CC=%d INT=%d EN=%d\n",
__FUNCTION__, pAhci->regHbaCccCtl,
@@ -1835,7 +1835,7 @@ static int HbaCccCtl_r(PAHCI pAhci, uint32_t iReg, uint32_t *pu32Value)
*/
static int HbaCccPorts_w(PAHCI pAhci, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
Log(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
pAhci->regHbaCccPorts = u32Value;
@@ -1848,7 +1848,7 @@ static int HbaCccPorts_w(PAHCI pAhci, uint32_t iReg, uint32_t u32Value)
*/
static int HbaCccPorts_r(PAHCI pAhci, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
Log(("%s: read regHbaCccPorts=%#010x\n", __FUNCTION__, pAhci->regHbaCccPorts));
#ifdef LOG_ENABLED
@@ -1871,7 +1871,7 @@ static int HbaCccPorts_r(PAHCI pAhci, uint32_t iReg, uint32_t *pu32Value)
*/
static int HbaInvalid_w(PAHCI pAhci, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF3(pAhci, iReg, u32Value);
+ RT_NOREF(pAhci, iReg, u32Value);
Log(("%s: Write denied!!! iReg=%u u32Value=%#010x\n", __FUNCTION__, iReg, u32Value));
return VINF_SUCCESS;
}
@@ -1881,7 +1881,7 @@ static int HbaInvalid_w(PAHCI pAhci, uint32_t iReg, uint32_t u32Value)
*/
static int PortInvalid_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF4(pAhci, pAhciPort, iReg, u32Value);
+ RT_NOREF(pAhci, pAhciPort, iReg, u32Value);
ahciLog(("%s: Write denied!!! iReg=%u u32Value=%#010x\n", __FUNCTION__, iReg, u32Value));
return VINF_SUCCESS;
}
@@ -1891,7 +1891,7 @@ static int PortInvalid_w(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32
*/
static int PortInvalid_r(PAHCI pAhci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF4(pAhci, pAhciPort, iReg, pu32Value);
+ RT_NOREF(pAhci, pAhciPort, iReg, pu32Value);
ahciLog(("%s: Read denied!!! iReg=%u\n", __FUNCTION__, iReg));
return VINF_SUCCESS;
}
diff --git a/src/VBox/Devices/Storage/DevATA.cpp b/src/VBox/Devices/Storage/DevATA.cpp
index 63fd7d6e94..e7615362c7 100644
--- a/src/VBox/Devices/Storage/DevATA.cpp
+++ b/src/VBox/Devices/Storage/DevATA.cpp
@@ -4500,7 +4500,7 @@ static uint32_t ataStatusRead(PATACONTROLLER pCtl, uint32_t addr)
{
ATADevState *s = &pCtl->aIfs[pCtl->iSelectedIf];
uint32_t val;
- RT_NOREF1(addr);
+ RT_NOREF(addr);
/// @todo The handler should not be even registered if there
// is no device on an IDE channel.
@@ -4516,7 +4516,7 @@ static uint32_t ataStatusRead(PATACONTROLLER pCtl, uint32_t addr)
static int ataControlWrite(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
{
- RT_NOREF1(addr);
+ RT_NOREF(addr);
#ifndef IN_RING3
if ((val ^ pCtl->aIfs[0].uATARegDevCtl) & ATA_DEVCTL_RESET)
return VINF_IOM_R3_IOPORT_WRITE; /* The RESET stuff is too complicated for RC+R0. */
@@ -5853,7 +5853,7 @@ static DECLCALLBACK(int) ataR3AsyncIOThread(RTTHREAD hThreadSelf, void *pvUser)
static uint32_t ataBMDMACmdReadB(PATACONTROLLER pCtl, uint32_t addr)
{
uint32_t val = pCtl->BmDma.u8Cmd;
- RT_NOREF1(addr);
+ RT_NOREF(addr);
Log2(("%s: addr=%#06x val=%#04x\n", __FUNCTION__, addr, val));
return val;
}
@@ -5861,7 +5861,7 @@ static uint32_t ataBMDMACmdReadB(PATACONTROLLER pCtl, uint32_t addr)
static void ataBMDMACmdWriteB(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
{
- RT_NOREF1(addr);
+ RT_NOREF(addr);
Log2(("%s: addr=%#06x val=%#04x\n", __FUNCTION__, addr, val));
if (!(val & BM_CMD_START))
{
@@ -5905,14 +5905,14 @@ static void ataBMDMACmdWriteB(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
static uint32_t ataBMDMAStatusReadB(PATACONTROLLER pCtl, uint32_t addr)
{
uint32_t val = pCtl->BmDma.u8Status;
- RT_NOREF1(addr);
+ RT_NOREF(addr);
Log2(("%s: addr=%#06x val=%#04x\n", __FUNCTION__, addr, val));
return val;
}
static void ataBMDMAStatusWriteB(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
{
- RT_NOREF1(addr);
+ RT_NOREF(addr);
Log2(("%s: addr=%#06x val=%#04x\n", __FUNCTION__, addr, val));
pCtl->BmDma.u8Status = (val & (BM_STATUS_D0DMA | BM_STATUS_D1DMA))
| (pCtl->BmDma.u8Status & BM_STATUS_DMAING)
@@ -5922,21 +5922,21 @@ static void ataBMDMAStatusWriteB(PATACONTROLLER pCtl, uint32_t addr, uint32_t va
static uint32_t ataBMDMAAddrReadL(PATACONTROLLER pCtl, uint32_t addr)
{
uint32_t val = (uint32_t)pCtl->BmDma.GCPhysAddr;
- RT_NOREF1(addr);
+ RT_NOREF(addr);
Log2(("%s: addr=%#06x val=%#010x\n", __FUNCTION__, addr, val));
return val;
}
static void ataBMDMAAddrWriteL(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
{
- RT_NOREF1(addr);
+ RT_NOREF(addr);
Log2(("%s: addr=%#06x val=%#010x\n", __FUNCTION__, addr, val));
pCtl->BmDma.GCPhysAddr = val & ~3;
}
static void ataBMDMAAddrWriteLowWord(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
{
- RT_NOREF1(addr);
+ RT_NOREF(addr);
Log2(("%s: addr=%#06x val=%#010x\n", __FUNCTION__, addr, val));
pCtl->BmDma.GCPhysAddr = (pCtl->BmDma.GCPhysAddr & 0xFFFF0000) | RT_LOWORD(val & ~3);
@@ -5945,7 +5945,7 @@ static void ataBMDMAAddrWriteLowWord(PATACONTROLLER pCtl, uint32_t addr, uint32_
static void ataBMDMAAddrWriteHighWord(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
{
Log2(("%s: addr=%#06x val=%#010x\n", __FUNCTION__, addr, val));
- RT_NOREF1(addr);
+ RT_NOREF(addr);
pCtl->BmDma.GCPhysAddr = (RT_LOWORD(val) << 16) | RT_LOWORD(pCtl->BmDma.GCPhysAddr);
}
diff --git a/src/VBox/Devices/Storage/DrvSCSI.cpp b/src/VBox/Devices/Storage/DrvSCSI.cpp
index ca78c41a25..92a946dc62 100644
--- a/src/VBox/Devices/Storage/DrvSCSI.cpp
+++ b/src/VBox/Devices/Storage/DrvSCSI.cpp
@@ -1090,7 +1090,7 @@ static DECLCALLBACK(void) drvscsiUnmountNotify(PPDMIMOUNTNOTIFY pInterface)
*/
static void drvscsiR3ResetOrSuspendOrPowerOff(PPDMDRVINS pDrvIns, PFNPDMDRVASYNCNOTIFY pfnAsyncNotify)
{
- RT_NOREF1(pfnAsyncNotify);
+ RT_NOREF(pfnAsyncNotify);
PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
diff --git a/src/VBox/Devices/Storage/UsbMsd.cpp b/src/VBox/Devices/Storage/UsbMsd.cpp
index 165daa2681..7249450c11 100644
--- a/src/VBox/Devices/Storage/UsbMsd.cpp
+++ b/src/VBox/Devices/Storage/UsbMsd.cpp
@@ -1073,7 +1073,7 @@ static int usbMsdResetWorker(PUSBMSD pThis, PVUSBURB pUrb, bool fSetConfig)
*/
static void usbMsdReqComplete(PUSBMSD pThis, PUSBMSDREQ pReq, int rcReq)
{
- RT_NOREF1(rcReq);
+ RT_NOREF(rcReq);
Log(("usbMsdLun0IoReqCompleteNotify: pReq=%p dCBWTag=%#x iScsiReqStatus=%u \n", pReq, pReq->Cbw.dCBWTag, pReq->iScsiReqStatus));
RTCritSectEnter(&pThis->CritSect);
diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp
index 53054bdd56..663a0705b4 100644
--- a/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp
+++ b/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp
@@ -236,7 +236,7 @@ static int mmcReadTOCNormal(PVSCSILUNINT pVScsiLun, PVSCSIREQINT pVScsiReq, uint
/* Fabricate session information. */
static int mmcReadTOCMulti(PVSCSILUNINT pVScsiLun, PVSCSIREQINT pVScsiReq, uint16_t cbMaxTransfer, bool fMSF)
{
- RT_NOREF1(cbMaxTransfer);
+ RT_NOREF(cbMaxTransfer);
uint8_t aReply[32];
uint8_t *pbBuf = aReply;
diff --git a/src/VBox/Devices/USB/DevOHCI.cpp b/src/VBox/Devices/USB/DevOHCI.cpp
index 55cf3b57d7..67945e688e 100644
--- a/src/VBox/Devices/USB/DevOHCI.cpp
+++ b/src/VBox/Devices/USB/DevOHCI.cpp
@@ -4234,7 +4234,7 @@ static void ohciR3RhPortPower(POHCIROOTHUB pRh, unsigned iPort, bool fPowerUp)
*/
static int HcRevision_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pThis, iReg);
+ RT_NOREF(pThis, iReg);
Log2(("HcRevision_r() -> 0x10\n"));
*pu32Value = 0x10; /* OHCI revision 1.0, no emulation. */
return VINF_SUCCESS;
@@ -4245,7 +4245,7 @@ static int HcRevision_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
*/
static int HcRevision_w(POHCI pThis, uint32_t iReg, uint32_t u32Value)
{
- RT_NOREF3(pThis, iReg, u32Value);
+ RT_NOREF(pThis, iReg, u32Value);
Log2(("HcRevision_w(%#010x) - denied\n", u32Value));
AssertMsgFailed(("Invalid operation!!! u32Value=%#010x\n", u32Value));
return VINF_SUCCESS;
@@ -4256,7 +4256,7 @@ static int HcRevision_w(POHCI pThis, uint32_t iReg, uint32_t u32Value)
*/
static int HcControl_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
uint32_t ctl = pThis->ctl;
Log2(("HcControl_r -> %#010x - CBSR=%d PLE=%d IE=%d CLE=%d BLE=%d HCFS=%#x IR=%d RWC=%d RWE=%d\n",
ctl, ctl & 3, (ctl >> 2) & 1, (ctl >> 3) & 1, (ctl >> 4) & 1, (ctl >> 5) & 1, (ctl >> 6) & 3, (ctl >> 8) & 1,
@@ -4270,7 +4270,7 @@ static int HcControl_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
*/
static int HcControl_w(POHCI pThis, uint32_t iReg, uint32_t val)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
/* log it. */
uint32_t chg = pThis->ctl ^ val; NOREF(chg);
@@ -4343,7 +4343,7 @@ static int HcCommandStatus_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
Log2(("HcCommandStatus_r() -> %#010x - HCR=%d CLF=%d BLF=%d OCR=%d SOC=%d\n",
status, status & 1, (status >> 1) & 1, (status >> 2) & 1, (status >> 3) & 1, (status >> 16) & 3));
*pu32Value = status;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4352,7 +4352,7 @@ static int HcCommandStatus_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
*/
static int HcCommandStatus_w(POHCI pThis, uint32_t iReg, uint32_t val)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
/* log */
uint32_t chg = pThis->status ^ val; NOREF(chg);
@@ -4398,7 +4398,7 @@ static int HcInterruptStatus_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
val, val & 1, (val >> 1) & 1, (val >> 2) & 1, (val >> 3) & 1, (val >> 4) & 1, (val >> 5) & 1,
(val >> 6) & 1, (val >> 30) & 1));
*pu32Value = val;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4407,7 +4407,7 @@ static int HcInterruptStatus_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
*/
static int HcInterruptStatus_w(POHCI pThis, uint32_t iReg, uint32_t val)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
uint32_t res = pThis->intr_status & ~val;
uint32_t chg = pThis->intr_status ^ res; NOREF(chg);
@@ -4449,7 +4449,7 @@ static int HcInterruptEnable_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
val, val & 1, (val >> 1) & 1, (val >> 2) & 1, (val >> 3) & 1, (val >> 4) & 1, (val >> 5) & 1,
(val >> 6) & 1, (val >> 30) & 1, (val >> 31) & 1));
*pu32Value = val;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4458,7 +4458,7 @@ static int HcInterruptEnable_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
*/
static int HcInterruptEnable_w(POHCI pThis, uint32_t iReg, uint32_t val)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
uint32_t res = pThis->intr | val;
uint32_t chg = pThis->intr ^ res; NOREF(chg);
@@ -4501,7 +4501,7 @@ static int HcInterruptDisable_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value
(val >> 6) & 1, (val >> 30) & 1, (val >> 31) & 1));
*pu32Value = val;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4510,7 +4510,7 @@ static int HcInterruptDisable_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value
*/
static int HcInterruptDisable_w(POHCI pThis, uint32_t iReg, uint32_t val)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
uint32_t res = pThis->intr & ~val;
uint32_t chg = pThis->intr ^ res; NOREF(chg);
@@ -4545,7 +4545,7 @@ static int HcHCCA_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
{
Log2(("HcHCCA_r() -> %#010x\n", pThis->hcca));
*pu32Value = pThis->hcca;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4556,7 +4556,7 @@ static int HcHCCA_w(POHCI pThis, uint32_t iReg, uint32_t Value)
{
Log2(("HcHCCA_w(%#010x) - old=%#010x new=%#010x\n", Value, pThis->hcca, Value & OHCI_HCCA_MASK));
pThis->hcca = Value & OHCI_HCCA_MASK;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4567,7 +4567,7 @@ static int HcPeriodCurrentED_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
{
Log2(("HcPeriodCurrentED_r() -> %#010x\n", pThis->per_cur));
*pu32Value = pThis->per_cur;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4581,7 +4581,7 @@ static int HcPeriodCurrentED_w(POHCI pThis, uint32_t iReg, uint32_t val)
//AssertMsgFailed(("HCD (Host Controller Driver) should not write to HcPeriodCurrentED! val=%#010x (old=%#010x)\n", val, pThis->per_cur));
AssertMsg(!(val & 7), ("Invalid alignment, val=%#010x\n", val));
pThis->per_cur = val & ~7;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4592,7 +4592,7 @@ static int HcControlHeadED_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
{
Log2(("HcControlHeadED_r() -> %#010x\n", pThis->ctrl_head));
*pu32Value = pThis->ctrl_head;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4604,7 +4604,7 @@ static int HcControlHeadED_w(POHCI pThis, uint32_t iReg, uint32_t val)
Log2(("HcControlHeadED_w(%#010x) - old=%#010x new=%#010x\n", val, pThis->ctrl_head, val & ~7));
AssertMsg(!(val & 7), ("Invalid alignment, val=%#010x\n", val));
pThis->ctrl_head = val & ~7;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4615,7 +4615,7 @@ static int HcControlCurrentED_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value
{
Log2(("HcControlCurrentED_r() -> %#010x\n", pThis->ctrl_cur));
*pu32Value = pThis->ctrl_cur;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4628,7 +4628,7 @@ static int HcControlCurrentED_w(POHCI pThis, uint32_t iReg, uint32_t val)
AssertMsg(!(pThis->ctl & OHCI_CTL_CLE), ("Illegal write! HcControl.ControlListEnabled is set! val=%#010x\n", val));
AssertMsg(!(val & 7), ("Invalid alignment, val=%#010x\n", val));
pThis->ctrl_cur = val & ~7;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4639,7 +4639,7 @@ static int HcBulkHeadED_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
{
Log2(("HcBulkHeadED_r() -> %#010x\n", pThis->bulk_head));
*pu32Value = pThis->bulk_head;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4651,7 +4651,7 @@ static int HcBulkHeadED_w(POHCI pThis, uint32_t iReg, uint32_t val)
Log2(("HcBulkHeadED_w(%#010x) - old=%#010x new=%#010x\n", val, pThis->bulk_head, val & ~7));
AssertMsg(!(val & 7), ("Invalid alignment, val=%#010x\n", val));
pThis->bulk_head = val & ~7; /** @todo The ATI OHCI controller on my machine enforces 16-byte address alignment. */
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4662,7 +4662,7 @@ static int HcBulkCurrentED_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
{
Log2(("HcBulkCurrentED_r() -> %#010x\n", pThis->bulk_cur));
*pu32Value = pThis->bulk_cur;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4675,7 +4675,7 @@ static int HcBulkCurrentED_w(POHCI pThis, uint32_t iReg, uint32_t val)
AssertMsg(!(pThis->ctl & OHCI_CTL_BLE), ("Illegal write! HcControl.BulkListEnabled is set! val=%#010x\n", val));
AssertMsg(!(val & 7), ("Invalid alignment, val=%#010x\n", val));
pThis->bulk_cur = val & ~7;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4687,7 +4687,7 @@ static int HcDoneHead_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
{
Log2(("HcDoneHead_r() -> 0x%#08x\n", pThis->done));
*pu32Value = pThis->done;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4696,7 +4696,7 @@ static int HcDoneHead_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
*/
static int HcDoneHead_w(POHCI pThis, uint32_t iReg, uint32_t val)
{
- RT_NOREF3(pThis, iReg, val);
+ RT_NOREF(pThis, iReg, val);
Log2(("HcDoneHead_w(0x%#08x) - denied!!!\n", val));
/*AssertMsgFailed(("Illegal operation!!! val=%#010x\n", val)); - OS/2 does this */
return VINF_SUCCESS;
@@ -4712,7 +4712,7 @@ static int HcFmInterval_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
Log2(("HcFmInterval_r() -> 0x%#08x - FI=%d FSMPS=%d FIT=%d\n",
val, val & 0x3fff, (val >> 16) & 0x7fff, val >> 31));
*pu32Value = val;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4721,7 +4721,7 @@ static int HcFmInterval_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
*/
static int HcFmInterval_w(POHCI pThis, uint32_t iReg, uint32_t val)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
/* log */
uint32_t chg = val ^ ((pThis->fit << 31) | (pThis->fsmps << 16) | pThis->fi); NOREF(chg);
@@ -4748,7 +4748,7 @@ static int HcFmInterval_w(POHCI pThis, uint32_t iReg, uint32_t val)
*/
static int HcFmRemaining_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
uint32_t Value = pThis->frt << 31;
if ((pThis->ctl & OHCI_CTL_HCFS) == OHCI_USB_OPERATIONAL)
{
@@ -4775,7 +4775,7 @@ static int HcFmRemaining_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
*/
static int HcFmRemaining_w(POHCI pThis, uint32_t iReg, uint32_t val)
{
- RT_NOREF3(pThis, iReg, val);
+ RT_NOREF(pThis, iReg, val);
Log2(("HcFmRemaining_w(%#010x) - denied\n", val));
AssertMsgFailed(("Invalid operation!!! val=%#010x\n", val));
return VINF_SUCCESS;
@@ -4786,7 +4786,7 @@ static int HcFmRemaining_w(POHCI pThis, uint32_t iReg, uint32_t val)
*/
static int HcFmNumber_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
uint32_t val = (uint16_t)pThis->HcFmNumber;
Log2(("HcFmNumber_r() -> %#010x - FN=%#x(%d) (32-bit=%#x(%d))\n", val, val, val, pThis->HcFmNumber, pThis->HcFmNumber));
*pu32Value = val;
@@ -4798,7 +4798,7 @@ static int HcFmNumber_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
*/
static int HcFmNumber_w(POHCI pThis, uint32_t iReg, uint32_t val)
{
- RT_NOREF3(pThis, iReg, val);
+ RT_NOREF(pThis, iReg, val);
Log2(("HcFmNumber_w(%#010x) - denied\n", val));
AssertMsgFailed(("Invalid operation!!! val=%#010x\n", val));
return VINF_SUCCESS;
@@ -4810,7 +4810,7 @@ static int HcFmNumber_w(POHCI pThis, uint32_t iReg, uint32_t val)
*/
static int HcPeriodicStart_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
Log2(("HcPeriodicStart_r() -> %#010x - PS=%d\n", pThis->pstart, pThis->pstart & 0x3fff));
*pu32Value = pThis->pstart;
return VINF_SUCCESS;
@@ -4822,7 +4822,7 @@ static int HcPeriodicStart_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
*/
static int HcPeriodicStart_w(POHCI pThis, uint32_t iReg, uint32_t val)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
Log2(("HcPeriodicStart_w(%#010x) => PS=%d\n", val, val & 0x3fff));
if (val & ~0x3fff)
Log2(("Unknown bits %#x are set!!!\n", val & ~0x3fff));
@@ -4835,7 +4835,7 @@ static int HcPeriodicStart_w(POHCI pThis, uint32_t iReg, uint32_t val)
*/
static int HcLSThreshold_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF2(pThis, iReg);
+ RT_NOREF(pThis, iReg);
Log2(("HcLSThreshold_r() -> %#010x\n", OHCI_LS_THRESH));
*pu32Value = OHCI_LS_THRESH;
return VINF_SUCCESS;
@@ -4855,7 +4855,7 @@ static int HcLSThreshold_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
*/
static int HcLSThreshold_w(POHCI pThis, uint32_t iReg, uint32_t val)
{
- RT_NOREF3(pThis, iReg, val);
+ RT_NOREF(pThis, iReg, val);
Log2(("HcLSThreshold_w(%#010x) => LST=0x%03x(%d)\n", val, val & 0x0fff, val & 0x0fff));
AssertMsg(val == OHCI_LS_THRESH,
("HCD tried to write bad LS threshold: 0x%x (see function header)\n", val));
@@ -4868,7 +4868,7 @@ static int HcLSThreshold_w(POHCI pThis, uint32_t iReg, uint32_t val)
*/
static int HcRhDescriptorA_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
uint32_t val = pThis->RootHub.desc_a;
#if 0 /* annoying */
Log2(("HcRhDescriptorA_r() -> %#010x - NDP=%d PSM=%d NPS=%d DT=%d OCPM=%d NOCP=%d POTGT=%#x\n",
@@ -4884,7 +4884,7 @@ static int HcRhDescriptorA_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
*/
static int HcRhDescriptorA_w(POHCI pThis, uint32_t iReg, uint32_t val)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
uint32_t chg = val ^ pThis->RootHub.desc_a; NOREF(chg);
Log2(("HcRhDescriptorA_w(%#010x) => %sNDP=%d %sPSM=%d %sNPS=%d %sDT=%d %sOCPM=%d %sNOCP=%d %sPOTGT=%#x - %sPowerSwitching Set%sPower\n",
val,
@@ -4922,7 +4922,7 @@ static int HcRhDescriptorB_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
Log2(("HcRhDescriptorB_r() -> %#010x - DR=0x%04x PPCM=0x%04x\n",
val, val & 0xffff, val >> 16));
*pu32Value = val;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -4931,7 +4931,7 @@ static int HcRhDescriptorB_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
*/
static int HcRhDescriptorB_w(POHCI pThis, uint32_t iReg, uint32_t val)
{
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
uint32_t chg = pThis->RootHub.desc_b ^ val; NOREF(chg);
Log2(("HcRhDescriptorB_w(%#010x) => %sDR=0x%04x %sPPCM=0x%04x\n",
val,
@@ -4955,7 +4955,7 @@ static int HcRhStatus_r(PCOHCI pThis, uint32_t iReg, uint32_t *pu32Value)
Log2(("HcRhStatus_r() -> %#010x - LPS=%d OCI=%d DRWE=%d LPSC=%d OCIC=%d CRWE=%d\n",
val, val & 1, (val >> 1) & 1, (val >> 15) & 1, (val >> 16) & 1, (val >> 17) & 1, (val >> 31) & 1));
*pu32Value = val;
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
}
@@ -5013,10 +5013,10 @@ static int HcRhStatus_w(POHCI pThis, uint32_t iReg, uint32_t val)
(chg >> 16) & 1 ? "*" : "", (val >> 16) & 1,
(chg >> 17) & 1 ? "*" : "", (val >> 17) & 1,
(chg >> 31) & 1 ? "*" : "", (val >> 31) & 1));
- RT_NOREF1(iReg);
+ RT_NOREF(iReg);
return VINF_SUCCESS;
#else /* !IN_RING3 */
- RT_NOREF3(pThis, iReg, val);
+ RT_NOREF(pThis, iReg, val);
return VINF_IOM_R3_MMIO_WRITE;
#endif /* !IN_RING3 */
}
@@ -5248,7 +5248,7 @@ static int HcRhPortStatus_w(POHCI pThis, uint32_t iReg, uint32_t val)
}
return VINF_SUCCESS;
#else /* !IN_RING3 */
- RT_NOREF3(pThis, iReg, val);
+ RT_NOREF(pThis, iReg, val);
return VINF_IOM_R3_MMIO_WRITE;
#endif /* !IN_RING3 */
}
diff --git a/src/VBox/Devices/VMMDev/VMMDev.cpp b/src/VBox/Devices/VMMDev/VMMDev.cpp
index 65f070e4b6..93d6e26707 100644
--- a/src/VBox/Devices/VMMDev/VMMDev.cpp
+++ b/src/VBox/Devices/VMMDev/VMMDev.cpp
@@ -2427,7 +2427,7 @@ static int vmmdevReqHandler_DebugIsPageShared(PVMMDEV pThis, VMMDevRequestHeader
# ifdef DEBUG
return PGMR3SharedModuleGetPageState(PDMDevHlpGetVM(pThis->pDevIns), pReq->GCPtrPage, &pReq->fShared, &pReq->uPageFlags);
# else
- RT_NOREF1(pThis);
+ RT_NOREF(pThis);
return VERR_NOT_IMPLEMENTED;
# endif
}
diff --git a/src/VBox/Disassembler/testcase/tstDisasm-1.cpp b/src/VBox/Disassembler/testcase/tstDisasm-1.cpp
index 69b942365b..303f1802fb 100644
--- a/src/VBox/Disassembler/testcase/tstDisasm-1.cpp
+++ b/src/VBox/Disassembler/testcase/tstDisasm-1.cpp
@@ -155,7 +155,7 @@ void testTwo(void)
int main(int argc, char **argv)
{
- RT_NOREF2(argc, argv);
+ RT_NOREF(argc, argv);
RTTEST hTest;
RTEXITCODE rcExit = RTTestInitAndCreate("tstDisasm", &hTest);
if (rcExit)
diff --git a/src/VBox/Disassembler/testcase/tstDisasm-2.cpp b/src/VBox/Disassembler/testcase/tstDisasm-2.cpp
index 151bb6a6b3..a14e63c0a9 100644
--- a/src/VBox/Disassembler/testcase/tstDisasm-2.cpp
+++ b/src/VBox/Disassembler/testcase/tstDisasm-2.cpp
@@ -239,7 +239,7 @@ static int MyDisasmBlock(const char *argv0, DISCPUMODE enmCpuMode, uint64_t uAdd
uint64_t uHighlightAddr, uint8_t *pbFile, size_t cbFile,
ASMSTYLE enmStyle, bool fListing, UNDEFOPHANDLING enmUndefOp)
{
- RT_NOREF1(fListing);
+ RT_NOREF(fListing);
/*
* Initialize the CPU context.
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/cmd/dtrace/dtrace.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/cmd/dtrace/dtrace.c
index 501a226b82..97de6fa35e 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/cmd/dtrace/dtrace.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/cmd/dtrace/dtrace.c
@@ -619,7 +619,7 @@ info_stmt(dtrace_hdl_t *dtp, dtrace_prog_t *pgp,
dtrace_ecbdesc_t *edp = stp->dtsd_ecbdesc;
dtrace_probedesc_t *pdp = &edp->dted_probe;
dtrace_probeinfo_t p;
- RT_NOREF1(pgp);
+ RT_NOREF(pgp);
if (edp == *last)
return (0);
@@ -746,7 +746,7 @@ static int
list_probe(dtrace_hdl_t *dtp, const dtrace_probedesc_t *pdp, void *arg)
{
dtrace_probeinfo_t p;
- RT_NOREF1(arg);
+ RT_NOREF(arg);
oprintf("%5d %10s %17s %33s %s\n", pdp->dtpd_id,
pdp->dtpd_provider, pdp->dtpd_mod, pdp->dtpd_func, pdp->dtpd_name);
@@ -763,7 +763,7 @@ list_stmt(dtrace_hdl_t *dtp, dtrace_prog_t *pgp,
dtrace_stmtdesc_t *stp, dtrace_ecbdesc_t **last)
{
dtrace_ecbdesc_t *edp = stp->dtsd_ecbdesc;
- RT_NOREF1(pgp);
+ RT_NOREF(pgp);
if (edp == *last)
return (0);
@@ -874,7 +874,7 @@ prochandler(struct ps_prochandle *P, const char *msg, void *arg)
break;
}
#else
- RT_NOREF3(P, msg, arg);
+ RT_NOREF(P, msg, arg);
#endif /* VBOX */
}
@@ -882,7 +882,7 @@ prochandler(struct ps_prochandle *P, const char *msg, void *arg)
static int
errhandler(const dtrace_errdata_t *data, void *arg)
{
- RT_NOREF1(arg);
+ RT_NOREF(arg);
error(data->dteda_msg);
return (DTRACE_HANDLE_OK);
}
@@ -891,7 +891,7 @@ errhandler(const dtrace_errdata_t *data, void *arg)
static int
drophandler(const dtrace_dropdata_t *data, void *arg)
{
- RT_NOREF1(arg);
+ RT_NOREF(arg);
error(data->dtdda_msg);
return (DTRACE_HANDLE_OK);
}
@@ -900,7 +900,7 @@ drophandler(const dtrace_dropdata_t *data, void *arg)
static int
setopthandler(const dtrace_setoptdata_t *data, void *arg)
{
- RT_NOREF1(arg);
+ RT_NOREF(arg);
if (strcmp(data->dtsda_option, "quiet") == 0)
g_quiet = data->dtsda_newval != DTRACEOPT_UNSET;
@@ -964,7 +964,7 @@ bufhandler(const dtrace_bufdata_t *bufdata, void *arg)
{ "???", UINT32_MAX },
{ NULL }
};
- RT_NOREF1(arg);
+ RT_NOREF(arg);
if (bufdata->dtbda_probe != NULL) {
pd = bufdata->dtbda_probe->dtpda_pdesc;
@@ -1064,7 +1064,7 @@ chewrec(const dtrace_probedata_t *data, const dtrace_recdesc_t *rec, void *arg)
{
dtrace_actkind_t act;
uintptr_t addr;
- RT_NOREF1(arg);
+ RT_NOREF(arg);
if (rec == NULL) {
/*
@@ -1095,7 +1095,7 @@ chew(const dtrace_probedata_t *data, void *arg)
dtrace_probedesc_t *pd = data->dtpda_pdesc;
processorid_t cpu = data->dtpda_cpu;
static int heading;
- RT_NOREF1(arg);
+ RT_NOREF(arg);
if (g_impatient) {
g_newline = 0;
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/common/ctf/ctf_create.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/common/ctf/ctf_create.c
index 4518f596eb..aa96e21892 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/common/ctf/ctf_create.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/common/ctf/ctf_create.c
@@ -1040,7 +1040,7 @@ membcmp(const char *name, ctf_id_t type, ulong_t offset, void *arg)
{
ctf_bundle_t *ctb = arg;
ctf_membinfo_t ctm;
- RT_NOREF1(type);
+ RT_NOREF(type);
return (ctf_member_info(ctb->ctb_file, ctb->ctb_type,
name, &ctm) == CTF_ERR || ctm.ctm_offset != offset);
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libctf/common/ctf_lib.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libctf/common/ctf_lib.c
index 4590d20d05..e18a96e984 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libctf/common/ctf_lib.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libctf/common/ctf_lib.c
@@ -116,7 +116,7 @@ static void *VBoxCtfMap64Fake(void *pvAddr, size_t cb, int fProt, int fFlags, in
off_t const offSaved = lseek(fd, 0, SEEK_CUR);
void *pvRet = NULL;
int err;
- RT_NOREF2(fProt, fFlags);
+ RT_NOREF(fProt, fFlags);
Assert(pvAddr == NULL); NOREF(pvAddr);
Assert(fProt == PROT_READ);
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libctf/common/ctf_subr.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libctf/common/ctf_subr.c
index 7de8069b81..527b59764c 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libctf/common/ctf_subr.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libctf/common/ctf_subr.c
@@ -89,7 +89,7 @@ ctf_free(void *buf, size_t size)
#ifndef VBOX
free(buf);
#else
- RT_NOREF1(size);
+ RT_NOREF(size);
RTMemFree(buf);
#endif
}
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_aggregate.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_aggregate.c
index 831b10818e..21aa49f87d 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_aggregate.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_aggregate.c
@@ -91,7 +91,7 @@ dt_aggregate_countcmp(int64_t *lhs, int64_t *rhs)
static void
dt_aggregate_min(int64_t *existing, int64_t *new, size_t size)
{
- RT_NOREF1(size);
+ RT_NOREF(size);
if (*new < *existing)
*existing = *new;
}
@@ -100,7 +100,7 @@ dt_aggregate_min(int64_t *existing, int64_t *new, size_t size)
static void
dt_aggregate_max(int64_t *existing, int64_t *new, size_t size)
{
- RT_NOREF1(size);
+ RT_NOREF(size);
if (*new > *existing)
*existing = *new;
}
@@ -142,7 +142,7 @@ dt_aggregate_lquantize(int64_t *existing, int64_t *new, size_t size)
int64_t arg = *existing++;
uint16_t levels = DTRACE_LQUANTIZE_LEVELS(arg);
int i;
- RT_NOREF1(size);
+ RT_NOREF(size);
for (i = 0; i <= levels + 1; i++)
existing[i] = existing[i] + new[i + 1];
@@ -281,7 +281,7 @@ dt_aggregate_usym(dtrace_hdl_t *dtp, uint64_t *data)
dt_proc_unlock(dtp, P);
dt_proc_release(dtp, P);
#else
- RT_NOREF2(dtp, data);
+ RT_NOREF(dtp, data);
#endif
}
@@ -308,7 +308,7 @@ dt_aggregate_umod(dtrace_hdl_t *dtp, uint64_t *data)
dt_proc_unlock(dtp, P);
dt_proc_release(dtp, P);
#else
- RT_NOREF2(dtp, data);
+ RT_NOREF(dtp, data);
#endif
}
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_as.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_as.c
index 728457cd25..13044ad5cb 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_as.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_as.c
@@ -82,7 +82,7 @@ static int
dt_countvar(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
{
size_t *np = data;
- RT_NOREF1(dhp);
+ RT_NOREF(dhp);
if (idp->di_flags & (DT_IDFLG_DIFR | DT_IDFLG_DIFW))
(*np)++; /* include variable in vartab */
@@ -98,7 +98,7 @@ dt_copyvar(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
dtrace_difv_t *dvp;
ssize_t stroff;
dt_node_t dn;
- RT_NOREF1(dhp);
+ RT_NOREF(dhp);
if (!(idp->di_flags & (DT_IDFLG_DIFR | DT_IDFLG_DIFW)))
return (0); /* omit variable from vartab */
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_cc.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_cc.c
index 4f69ed389c..dadb931323 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_cc.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_cc.c
@@ -138,7 +138,7 @@ static void *dt_compile(dtrace_hdl_t *, int, dtrace_probespec_t, void *,
static int
dt_idreset(dt_idhash_t *dhp, dt_ident_t *idp, void *ignored)
{
- RT_NOREF2(dhp, ignored);
+ RT_NOREF(dhp, ignored);
idp->di_flags &= ~(DT_IDFLG_REF | DT_IDFLG_MOD |
DT_IDFLG_DIFR | DT_IDFLG_DIFW);
return (0);
@@ -148,7 +148,7 @@ dt_idreset(dt_idhash_t *dhp, dt_ident_t *idp, void *ignored)
static int
dt_idpragma(dt_idhash_t *dhp, dt_ident_t *idp, void *ignored)
{
- RT_NOREF2(dhp, ignored);
+ RT_NOREF(dhp, ignored);
yylineno = idp->di_lineno;
xyerror(D_PRAGMA_UNUSED, "unused #pragma %s\n", (char *)idp->di_iarg);
#ifndef _MSC_VER /* unreachable */
@@ -861,7 +861,7 @@ static void
dt_action_symmod_args(dtrace_hdl_t *dtp, dtrace_actdesc_t *ap,
dt_node_t *dnp, dtrace_actkind_t kind)
{
- RT_NOREF1(dtp);
+ RT_NOREF(dtp);
assert(kind == DTRACEACT_SYM || kind == DTRACEACT_MOD ||
kind == DTRACEACT_USYM || kind == DTRACEACT_UMOD ||
kind == DTRACEACT_UADDR);
@@ -885,7 +885,7 @@ static void
dt_action_ftruncate(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
{
dtrace_actdesc_t *ap = dt_stmt_action(dtp, sdp);
- RT_NOREF1(dnp);
+ RT_NOREF(dnp);
/*
* Library actions need a DIFO that serves as an argument. As
@@ -902,7 +902,7 @@ static void
dt_action_stop(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
{
dtrace_actdesc_t *ap = dt_stmt_action(dtp, sdp);
- RT_NOREF1(dnp);
+ RT_NOREF(dnp);
ap->dtad_kind = DTRACEACT_STOP;
ap->dtad_arg = 0;
@@ -913,7 +913,7 @@ static void
dt_action_breakpoint(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
{
dtrace_actdesc_t *ap = dt_stmt_action(dtp, sdp);
- RT_NOREF1(dnp);
+ RT_NOREF(dnp);
ap->dtad_kind = DTRACEACT_BREAKPOINT;
ap->dtad_arg = 0;
@@ -924,7 +924,7 @@ static void
dt_action_panic(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
{
dtrace_actdesc_t *ap = dt_stmt_action(dtp, sdp);
- RT_NOREF1(dnp);
+ RT_NOREF(dnp);
ap->dtad_kind = DTRACEACT_PANIC;
ap->dtad_arg = 0;
@@ -1740,7 +1740,7 @@ err:
return (NULL);
#else /* VBOX */
- RT_NOREF1(ifp);
+ RT_NOREF(ifp);
(void) dt_set_errno(dtp, EDT_CPPERR);
return (NULL);
#endif /* VBOX */
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_consume.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_consume.c
index 9318df2646..e9bc587e59 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_consume.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_consume.c
@@ -701,7 +701,7 @@ dt_print_average(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
{
/* LINTED - alignment */
int64_t *data = (int64_t *)addr;
- RT_NOREF1(size);
+ RT_NOREF(size);
return (dt_printf(dtp, fp, " %16lld", data[0] ?
(long long)(data[1] / (int64_t)normal / data[0]) : 0));
@@ -714,7 +714,7 @@ dt_print_stddev(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
{
/* LINTED - alignment */
uint64_t *data = (uint64_t *)addr;
- RT_NOREF1(size);
+ RT_NOREF(size);
return (dt_printf(dtp, fp, " %16llu", data[0] ?
(unsigned long long) dt_stddev(data, normal) : 0));
@@ -1093,7 +1093,7 @@ dt_print_usym(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr, dtrace_actkind_t act)
}
}
#else
- RT_NOREF1(act);
+ RT_NOREF(act);
#endif
do {
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_decl.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_decl.c
index 5d79ab8c55..e0bb774d4b 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_decl.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_decl.c
@@ -652,7 +652,7 @@ done:
static int
dt_decl_hasmembers(const char *name, int value, void *private)
{
- RT_NOREF3(name, value, private);
+ RT_NOREF(name, value, private);
return (1); /* abort search and return true if a member exists */
}
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_dis.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_dis.c
index 44523931aa..ad55d7d43b 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_dis.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_dis.c
@@ -38,7 +38,7 @@
static void
dt_dis_log(const dtrace_difo_t *dp, const char *name, dif_instr_t in, FILE *fp)
{
- RT_NOREF1(dp);
+ RT_NOREF(dp);
(void) fprintf(fp, "%-4s %%r%u, %%r%u, %%r%u", name,
DIF_INSTR_R1(in), DIF_INSTR_R2(in), DIF_INSTR_RD(in));
}
@@ -48,7 +48,7 @@ static void
dt_dis_branch(const dtrace_difo_t *dp, const char *name,
dif_instr_t in, FILE *fp)
{
- RT_NOREF1(dp);
+ RT_NOREF(dp);
(void) fprintf(fp, "%-4s %u", name, DIF_INSTR_LABEL(in));
}
@@ -56,7 +56,7 @@ dt_dis_branch(const dtrace_difo_t *dp, const char *name,
static void
dt_dis_load(const dtrace_difo_t *dp, const char *name, dif_instr_t in, FILE *fp)
{
- RT_NOREF1(dp);
+ RT_NOREF(dp);
(void) fprintf(fp, "%-4s [%%r%u], %%r%u", name,
DIF_INSTR_R1(in), DIF_INSTR_RD(in));
}
@@ -66,7 +66,7 @@ static void
dt_dis_store(const dtrace_difo_t *dp, const char *name,
dif_instr_t in, FILE *fp)
{
- RT_NOREF1(dp);
+ RT_NOREF(dp);
(void) fprintf(fp, "%-4s %%r%u, [%%r%u]", name,
DIF_INSTR_R1(in), DIF_INSTR_RD(in));
}
@@ -75,7 +75,7 @@ dt_dis_store(const dtrace_difo_t *dp, const char *name,
static void
dt_dis_str(const dtrace_difo_t *dp, const char *name, dif_instr_t in, FILE *fp)
{
- RT_NOREF2(dp, in);
+ RT_NOREF(dp, in);
(void) fprintf(fp, "%s", name);
}
@@ -83,7 +83,7 @@ dt_dis_str(const dtrace_difo_t *dp, const char *name, dif_instr_t in, FILE *fp)
static void
dt_dis_r1rd(const dtrace_difo_t *dp, const char *name, dif_instr_t in, FILE *fp)
{
- RT_NOREF1(dp);
+ RT_NOREF(dp);
(void) fprintf(fp, "%-4s %%r%u, %%r%u", name,
DIF_INSTR_R1(in), DIF_INSTR_RD(in));
}
@@ -92,7 +92,7 @@ dt_dis_r1rd(const dtrace_difo_t *dp, const char *name, dif_instr_t in, FILE *fp)
static void
dt_dis_cmp(const dtrace_difo_t *dp, const char *name, dif_instr_t in, FILE *fp)
{
- RT_NOREF1(dp);
+ RT_NOREF(dp);
(void) fprintf(fp, "%-4s %%r%u, %%r%u", name,
DIF_INSTR_R1(in), DIF_INSTR_R2(in));
}
@@ -101,7 +101,7 @@ dt_dis_cmp(const dtrace_difo_t *dp, const char *name, dif_instr_t in, FILE *fp)
static void
dt_dis_tst(const dtrace_difo_t *dp, const char *name, dif_instr_t in, FILE *fp)
{
- RT_NOREF1(dp);
+ RT_NOREF(dp);
(void) fprintf(fp, "%-4s %%r%u", name, DIF_INSTR_R1(in));
}
@@ -202,7 +202,7 @@ dt_dis_sets(const dtrace_difo_t *dp, const char *name, dif_instr_t in, FILE *fp)
static void
dt_dis_ret(const dtrace_difo_t *dp, const char *name, dif_instr_t in, FILE *fp)
{
- RT_NOREF1(dp);
+ RT_NOREF(dp);
(void) fprintf(fp, "%-4s %%r%u", name, DIF_INSTR_RD(in));
}
@@ -211,7 +211,7 @@ static void
dt_dis_call(const dtrace_difo_t *dp, const char *name, dif_instr_t in, FILE *fp)
{
uint_t subr = DIF_INSTR_SUBR(in);
- RT_NOREF1(dp);
+ RT_NOREF(dp);
(void) fprintf(fp, "%-4s DIF_SUBR(%u), %%r%u\t\t! %s",
name, subr, DIF_INSTR_RD(in), dtrace_subrstr(NULL, subr));
@@ -224,7 +224,7 @@ dt_dis_pushts(const dtrace_difo_t *dp,
{
static const char *const tnames[] = { "D type", "string" };
uint_t type = DIF_INSTR_TYPE(in);
- RT_NOREF1(dp);
+ RT_NOREF(dp);
(void) fprintf(fp, "%-4s DT_TYPE(%u), %%r%u, %%r%u",
name, type, DIF_INSTR_R2(in), DIF_INSTR_RS(in));
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_error.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_error.c
index ffcf4fcc0c..2970db96e9 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_error.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_error.c
@@ -208,7 +208,7 @@ dtrace_faultstr(dtrace_hdl_t *dtp, int fault)
{ DTRACEFLT_LIBRARY, "library-level fault" },
{ 0, NULL }
};
- RT_NOREF1(dtp);
+ RT_NOREF(dtp);
for (i = 0; faults[i].str != NULL; i++) {
if (faults[i].code == fault)
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_ident.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_ident.c
index 37a80be865..20799930d4 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_ident.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_ident.c
@@ -470,7 +470,7 @@ dt_idcook_regs(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *ap)
static void
dt_idcook_type(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *args)
{
- RT_NOREF2(argc, args);
+ RT_NOREF(argc, args);
if (idp->di_type == CTF_ERR) {
dtrace_hdl_t *dtp = yypcb->pcb_hdl;
dtrace_typeinfo_t dtt;
@@ -493,7 +493,7 @@ dt_idcook_type(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *args)
static void
dt_idcook_thaw(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *args)
{
- RT_NOREF2(argc, args);
+ RT_NOREF(argc, args);
if (idp->di_ctfp != NULL && idp->di_type != CTF_ERR)
dt_node_type_assign(dnp, idp->di_ctfp, idp->di_type);
}
@@ -546,7 +546,7 @@ dt_iddtor_inline(dt_ident_t *idp)
static void
dt_iddtor_none(dt_ident_t *idp)
{
- RT_NOREF1(idp);
+ RT_NOREF(idp);
/* do nothing */
}
@@ -567,7 +567,7 @@ dt_idsize_type(dt_ident_t *idp)
static size_t
dt_idsize_none(dt_ident_t *idp)
{
- RT_NOREF1(idp);
+ RT_NOREF(idp);
return (0);
}
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_module.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_module.c
index 8cafc7a827..c089c22c5c 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_module.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_module.c
@@ -484,7 +484,7 @@ dt_module_lookup_by_name(dtrace_hdl_t *dtp, const char *name)
dt_module_t *
dt_module_lookup_by_ctf(dtrace_hdl_t *dtp, ctf_file_t *ctfp)
{
- RT_NOREF1(dtp);
+ RT_NOREF(dtp);
return (ctfp ? ctf_getspecific(ctfp) : NULL);
}
@@ -526,7 +526,7 @@ dt_module_load_sect(dtrace_hdl_t *dtp, dt_module_t *dmp, ctf_sect_t *ctsp)
dmp->dm_name, ctsp->cts_name, (ulong_t)ctsp->cts_size);
#else /* VBOX */
- RT_NOREF3(dtp, dmp, ctsp);
+ RT_NOREF(dtp, dmp, ctsp);
#endif /* VBOX */
return (0);
}
@@ -695,7 +695,7 @@ err:
void
dt_module_unload(dtrace_hdl_t *dtp, dt_module_t *dmp)
{
- RT_NOREF1(dtp);
+ RT_NOREF(dtp);
ctf_close(dmp->dm_ctfp);
dmp->dm_ctfp = NULL;
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_options.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_options.c
index f61512bf0e..eb7ace973a 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_options.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_options.c
@@ -79,7 +79,7 @@ dt_opt_amin(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
char str[DTRACE_ATTR2STR_MAX];
dtrace_attribute_t attr;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL || dtrace_str2attr(arg, &attr) == -1)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -131,7 +131,7 @@ static int
dt_opt_core(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
static int enabled = 0;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg != NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -146,7 +146,7 @@ dt_opt_core(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
static int
dt_opt_cpp_hdrs(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg != NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -165,7 +165,7 @@ static int
dt_opt_cpp_path(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
char *cpp;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -213,7 +213,7 @@ static int
dt_opt_ctypes(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
int fd;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -230,7 +230,7 @@ dt_opt_ctypes(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
static int
dt_opt_droptags(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
- RT_NOREF2(option, arg);
+ RT_NOREF(option, arg);
dtp->dt_droptags = 1;
return (0);
@@ -241,7 +241,7 @@ static int
dt_opt_dtypes(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
int fd;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -258,7 +258,7 @@ dt_opt_dtypes(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
static int
dt_opt_debug(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg != NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -272,7 +272,7 @@ static int
dt_opt_iregs(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
int n;
- RT_NOREF2(arg, option);
+ RT_NOREF(arg, option);
if (arg == NULL || (n = atoi(arg)) <= 0)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -285,7 +285,7 @@ dt_opt_iregs(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
static int
dt_opt_lazyload(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
- RT_NOREF2(arg, option);
+ RT_NOREF(arg, option);
dtp->dt_lazyload = 1;
return (0);
@@ -296,7 +296,7 @@ static int
dt_opt_ld_path(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
char *ld;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -318,7 +318,7 @@ static int
dt_opt_libdir(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
dt_dirpath_t *dp;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -337,7 +337,7 @@ dt_opt_libdir(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
static int
dt_opt_linkmode(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -360,7 +360,7 @@ dt_opt_linkmode(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
static int
dt_opt_linktype(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -379,7 +379,7 @@ dt_opt_linktype(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
static int
dt_opt_evaltime(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -403,7 +403,7 @@ static int
dt_opt_pgmax(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
int n;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL || (n = atoi(arg)) < 0)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -416,7 +416,7 @@ dt_opt_pgmax(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
static int
dt_opt_stdc(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -444,7 +444,7 @@ dt_opt_syslibdir(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
dt_dirpath_t *dp = dt_list_next(&dtp->dt_lib_path);
char *path;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -464,7 +464,7 @@ static int
dt_opt_tree(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
int m;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL || (m = atoi(arg)) <= 0)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -478,7 +478,7 @@ static int
dt_opt_tregs(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
int n;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL || (n = atoi(arg)) <= 0)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -491,7 +491,7 @@ dt_opt_tregs(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
static int
dt_opt_xlate(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -550,7 +550,7 @@ static int
dt_opt_version(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
dt_version_t v;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -818,7 +818,7 @@ dt_opt_bufpolicy(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
dtrace_optval_t policy = DTRACEOPT_UNSET;
int i;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -853,7 +853,7 @@ dt_opt_bufresize(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
dtrace_optval_t policy = DTRACEOPT_UNSET;
int i;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
@@ -936,7 +936,7 @@ dt_opt_preallocate(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
dtrace_optval_t size;
void *p;
- RT_NOREF1(option);
+ RT_NOREF(option);
if (arg == NULL || dt_optval_parse(arg, &size) != 0)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_parser.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_parser.c
index 7261b7945b..fe91bce575 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_parser.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_parser.c
@@ -2843,7 +2843,7 @@ dt_cook_var(dt_node_t *dnp, uint_t idflags)
static dt_node_t *
dt_cook_func(dt_node_t *dnp, uint_t idflags)
{
- RT_NOREF1(idflags);
+ RT_NOREF(idflags);
dt_node_attr_assign(dnp,
dt_ident_cook(dnp, dnp->dn_ident, &dnp->dn_args));
@@ -3943,7 +3943,7 @@ dt_cook_op3(dt_node_t *dnp, uint_t idflags)
dt_node_t *lp, *rp;
ctf_file_t *ctfp;
ctf_id_t type;
- RT_NOREF1(idflags);
+ RT_NOREF(idflags);
dnp->dn_expr = dt_node_cook(dnp->dn_expr, DT_IDFLG_REF);
lp = dnp->dn_left = dt_node_cook(dnp->dn_left, DT_IDFLG_REF);
@@ -4011,7 +4011,7 @@ static dt_node_t *
dt_cook_aggregation(dt_node_t *dnp, uint_t idflags)
{
dtrace_hdl_t *dtp = yypcb->pcb_hdl;
- RT_NOREF1(idflags);
+ RT_NOREF(idflags);
if (dnp->dn_aggfun != NULL) {
dnp->dn_aggfun = dt_node_cook(dnp->dn_aggfun, DT_IDFLG_REF);
@@ -4138,7 +4138,7 @@ dt_cook_inline(dt_node_t *dnp, uint_t idflags)
char n1[DT_TYPE_NAMELEN];
char n2[DT_TYPE_NAMELEN];
- RT_NOREF1(idflags);
+ RT_NOREF(idflags);
assert(dnp->dn_ident->di_flags & DT_IDFLG_INLINE);
assert(inp->din_root->dn_flags & DT_NF_COOKED);
@@ -4203,7 +4203,7 @@ dt_cook_xlator(dt_node_t *dnp, uint_t idflags)
dtrace_attribute_t attr = _dtrace_maxattr;
ctf_membinfo_t ctm;
- RT_NOREF1(idflags);
+ RT_NOREF(idflags);
/*
* Before cooking each translator member, we push a reference to the
@@ -4361,7 +4361,7 @@ dt_cook_provider(dt_node_t *dnp, uint_t idflags)
{
dt_provider_t *pvp = dnp->dn_provider;
dt_node_t *pnp;
- RT_NOREF1(idflags);
+ RT_NOREF(idflags);
/*
* If we're declaring a provider for the first time and it is unknown
@@ -4400,7 +4400,7 @@ dt_cook_provider(dt_node_t *dnp, uint_t idflags)
static dt_node_t *
dt_cook_none(dt_node_t *dnp, uint_t idflags)
{
- RT_NOREF1(idflags);
+ RT_NOREF(idflags);
return (dnp);
}
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_pragma.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_pragma.c
index b84165ab4a..f423e8a018 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_pragma.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_pragma.c
@@ -47,7 +47,7 @@ dt_pragma_apply(dt_idhash_t *dhp, dt_ident_t *idp)
{
dt_idhash_t *php;
dt_ident_t *pdp;
- RT_NOREF1(dhp);
+ RT_NOREF(dhp);
if ((php = yypcb->pcb_pragmas) == NULL)
return; /* no pragmas pending for current compilation pass */
@@ -319,7 +319,7 @@ static void
dt_pragma_ident(const char *prname, dt_node_t *dnp)
{
/* ignore any #ident or #pragma ident lines */
- RT_NOREF2(prname, dnp);
+ RT_NOREF(prname, dnp);
}
static void
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c
index 906ec9b92c..eb09043dc0 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c
@@ -57,7 +57,7 @@ static const char g_aszDay[7][4] =
static int
pfcheck_addr(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- RT_NOREF2(pfv, pfd);
+ RT_NOREF(pfv, pfd);
return (dt_node_is_pointer(dnp) || dt_node_is_integer(dnp));
}
@@ -65,7 +65,7 @@ pfcheck_addr(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
static int
pfcheck_kaddr(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- RT_NOREF2(pfv, pfd);
+ RT_NOREF(pfv, pfd);
return (dt_node_is_pointer(dnp) || dt_node_is_integer(dnp) ||
dt_node_is_symaddr(dnp));
}
@@ -76,7 +76,7 @@ pfcheck_uaddr(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
dtrace_hdl_t *dtp = pfv->pfv_dtp;
dt_ident_t *idp = dt_idhash_lookup(dtp->dt_macros, "target");
- RT_NOREF1(pfd);
+ RT_NOREF(pfd);
if (dt_node_is_usymaddr(dnp))
return (1);
@@ -91,7 +91,7 @@ pfcheck_uaddr(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
static int
pfcheck_stack(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- RT_NOREF2(pfv, pfd);
+ RT_NOREF(pfv, pfd);
return (dt_node_is_stack(dnp));
}
@@ -99,7 +99,7 @@ pfcheck_stack(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
static int
pfcheck_time(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- RT_NOREF2(pfv, pfd);
+ RT_NOREF(pfv, pfd);
return (dt_node_is_integer(dnp) &&
dt_node_type_size(dnp) == sizeof (uint64_t));
}
@@ -113,7 +113,7 @@ pfcheck_str(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
ctf_arinfo_t r;
ctf_id_t base;
uint_t kind;
- RT_NOREF2(pfv, pfd);
+ RT_NOREF(pfv, pfd);
if (dt_node_is_string(dnp))
return (1);
@@ -137,7 +137,7 @@ pfcheck_wstr(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
ctf_encoding_t e;
ctf_arinfo_t r;
- RT_NOREF2(pfv, pfd);
+ RT_NOREF(pfv, pfd);
return (kind == CTF_K_ARRAY && ctf_array_info(ctfp, base, &r) == 0 &&
(base = ctf_type_resolve(ctfp, r.ctr_contents)) != CTF_ERR &&
@@ -149,7 +149,7 @@ pfcheck_wstr(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
static int
pfcheck_csi(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- RT_NOREF2(pfv, pfd);
+ RT_NOREF(pfv, pfd);
return (dt_node_is_integer(dnp) &&
dt_node_type_size(dnp) <= sizeof (int));
}
@@ -158,7 +158,7 @@ pfcheck_csi(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
static int
pfcheck_fp(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- RT_NOREF2(pfv, pfd);
+ RT_NOREF(pfv, pfd);
return (dt_node_is_float(dnp));
}
@@ -166,7 +166,7 @@ pfcheck_fp(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
static int
pfcheck_xint(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- RT_NOREF2(pfv, pfd);
+ RT_NOREF(pfv, pfd);
return (dt_node_is_integer(dnp));
}
@@ -174,7 +174,7 @@ pfcheck_xint(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
static int
pfcheck_dint(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- RT_NOREF2(pfv, pfd);
+ RT_NOREF(pfv, pfd);
if (dnp->dn_flags & DT_NF_SIGNED)
pfd->pfd_flags |= DT_PFCONV_SIGNED;
else
@@ -190,7 +190,7 @@ pfcheck_xshort(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
ctf_file_t *ctfp = dnp->dn_ctfp;
ctf_id_t type = ctf_type_resolve(ctfp, dnp->dn_type);
char n[DT_TYPE_NAMELEN];
- RT_NOREF2(pfv, pfd);
+ RT_NOREF(pfv, pfd);
return (ctf_type_name(ctfp, type, n, sizeof (n)) != NULL && (
strcmp(n, "short") == 0 || strcmp(n, "signed short") == 0 ||
@@ -204,7 +204,7 @@ pfcheck_xlong(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
ctf_file_t *ctfp = dnp->dn_ctfp;
ctf_id_t type = ctf_type_resolve(ctfp, dnp->dn_type);
char n[DT_TYPE_NAMELEN];
- RT_NOREF2(pfv, pfd);
+ RT_NOREF(pfv, pfd);
return (ctf_type_name(ctfp, type, n, sizeof (n)) != NULL && (
strcmp(n, "long") == 0 || strcmp(n, "signed long") == 0 ||
@@ -218,7 +218,7 @@ pfcheck_xlonglong(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
ctf_file_t *ctfp = dnp->dn_ctfp;
ctf_id_t type = dnp->dn_type;
char n[DT_TYPE_NAMELEN];
- RT_NOREF2(pfv, pfd);
+ RT_NOREF(pfv, pfd);
if (ctf_type_name(ctfp, ctf_type_resolve(ctfp, type), n,
sizeof (n)) != NULL && (strcmp(n, "long long") == 0 ||
@@ -247,7 +247,7 @@ pfcheck_xlonglong(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
static int
pfcheck_type(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- RT_NOREF1(pfv);
+ RT_NOREF(pfv);
return (ctf_type_compat(dnp->dn_ctfp, ctf_type_resolve(dnp->dn_ctfp,
dnp->dn_type), pfd->pfd_conv->pfc_dctfp, pfd->pfd_conv->pfc_dtype));
}
@@ -259,7 +259,7 @@ pfprint_sint(dtrace_hdl_t *dtp, FILE *fp, const char *format,
{
int64_t normal = (int64_t)unormal;
int32_t n = (int32_t)normal;
- RT_NOREF1(pfd);
+ RT_NOREF(pfd);
switch (size) {
case sizeof (int8_t):
@@ -285,7 +285,7 @@ pfprint_uint(dtrace_hdl_t *dtp, FILE *fp, const char *format,
const dt_pfargd_t *pfd, const void *addr, size_t size, uint64_t normal)
{
uint32_t n = (uint32_t)normal;
- RT_NOREF1(pfd);
+ RT_NOREF(pfd);
switch (size) {
case sizeof (uint8_t):
@@ -324,7 +324,7 @@ pfprint_fp(dtrace_hdl_t *dtp, FILE *fp, const char *format,
#ifndef _MSC_VER
long double ldn = (long double)normal;
#endif
- RT_NOREF1(pfd);
+ RT_NOREF(pfd);
switch (size) {
case sizeof (float):
@@ -351,7 +351,7 @@ pfprint_addr(dtrace_hdl_t *dtp, FILE *fp, const char *format,
char *s;
int n, len = 256;
uint64_t val;
- RT_NOREF2(pfd, normal);
+ RT_NOREF(pfd, normal);
switch (size) {
case sizeof (uint32_t):
@@ -377,7 +377,7 @@ static int
pfprint_mod(dtrace_hdl_t *dtp, FILE *fp, const char *format,
const dt_pfargd_t *pfd, const void *addr, size_t size, uint64_t normal)
{
- RT_NOREF3(pfd, size, normal);
+ RT_NOREF(pfd, size, normal);
return (dt_print_mod(dtp, fp, format, (caddr_t)addr));
}
@@ -386,7 +386,7 @@ static int
pfprint_umod(dtrace_hdl_t *dtp, FILE *fp, const char *format,
const dt_pfargd_t *pfd, const void *addr, size_t size, uint64_t normal)
{
- RT_NOREF3(pfd, size, normal);
+ RT_NOREF(pfd, size, normal);
return (dt_print_umod(dtp, fp, format, (caddr_t)addr));
}
@@ -400,7 +400,7 @@ pfprint_uaddr(dtrace_hdl_t *dtp, FILE *fp, const char *format,
uint64_t val, pid = 0;
dt_ident_t *idp = dt_idhash_lookup(dtp->dt_macros, "target");
- RT_NOREF2(pfd, normal);
+ RT_NOREF(pfd, normal);
switch (size) {
case sizeof (uint32_t):
@@ -438,7 +438,7 @@ pfprint_stack(dtrace_hdl_t *dtp, FILE *fp, const char *format,
const dtrace_recdesc_t *rec = pfd->pfd_rec;
caddr_t addr = (caddr_t)vaddr;
int err = 0;
- RT_NOREF2(size, normal);
+ RT_NOREF(size, normal);
/*
* We have stashed the value of the STACKINDENT option, and we will
@@ -515,7 +515,7 @@ pfprint_time(dtrace_hdl_t *dtp, FILE *fp, const char *format,
RTTIMESPEC TimeSpec;
RTTIME Time;
char buf[32];
- RT_NOREF3(pfd, size, normal);
+ RT_NOREF(pfd, size, normal);
RTTimeLocalExplode(&Time, RTTimeSpecSetNano(&TimeSpec, *(uint64_t *)addr));
RTStrPrintf(buf, sizeof(buf), "%u %s %2u %02u:%02u:%02u",
@@ -547,7 +547,7 @@ pfprint_time822(dtrace_hdl_t *dtp, FILE *fp, const char *format,
RTTIMESPEC TimeSpec;
RTTIME Time;
char buf[64];
- RT_NOREF3(pfd, size, normal);
+ RT_NOREF(pfd, size, normal);
RTTimeLocalExplode(&Time, RTTimeSpecSetNano(&TimeSpec, *(uint64_t *)addr));
RTStrPrintf(buf, sizeof(buf), "%s, %u %s %02u:%02u:%02u %s%u%s",
@@ -576,7 +576,7 @@ pfprint_port(dtrace_hdl_t *dtp, FILE *fp, const char *format,
#else
uint16_t uPortNet = *(uint16_t *)addr;
char buf[32];
- RT_NOREF3(pfd, size, normal);
+ RT_NOREF(pfd, size, normal);
RTStrPrintf(buf, sizeof(buf), "%d", RT_N2H_U16(uPortNet));
#endif
@@ -595,7 +595,7 @@ pfprint_inetaddr(dtrace_hdl_t *dtp, FILE *fp, const char *format,
char buf[1024];
int e;
#endif
- RT_NOREF2(pfd, normal);
+ RT_NOREF(pfd, normal);
bcopy(addr, s, size);
s[size] = '\0';
@@ -621,7 +621,7 @@ pfprint_cstr(dtrace_hdl_t *dtp, FILE *fp, const char *format,
const dt_pfargd_t *pfd, const void *addr, size_t size, uint64_t normal)
{
char *s = alloca(size + 1);
- RT_NOREF2(pfd, normal);
+ RT_NOREF(pfd, normal);
bcopy(addr, s, size);
s[size] = '\0';
@@ -634,7 +634,7 @@ pfprint_wstr(dtrace_hdl_t *dtp, FILE *fp, const char *format,
const dt_pfargd_t *pfd, const void *addr, size_t size, uint64_t normal)
{
wchar_t *ws = alloca(size + sizeof (wchar_t));
- RT_NOREF2(pfd, normal);
+ RT_NOREF(pfd, normal);
bcopy(addr, ws, size);
ws[size / sizeof (wchar_t)] = L'\0';
@@ -648,7 +648,7 @@ pfprint_estr(dtrace_hdl_t *dtp, FILE *fp, const char *format,
{
char *s;
int n;
- RT_NOREF2(pfd, normal);
+ RT_NOREF(pfd, normal);
if ((s = strchr2esc(addr, size)) == NULL)
return (dt_set_errno(dtp, EDT_NOMEM));
@@ -686,7 +686,7 @@ static int
pfprint_pct(dtrace_hdl_t *dtp, FILE *fp, const char *format,
const dt_pfargd_t *pfd, const void *addr, size_t size, uint64_t normal)
{
- RT_NOREF5(format, pfd, addr, size, normal);
+ RT_NOREF(format, pfd, addr, size, normal);
return (dt_printf(dtp, fp, "%%"));
}
@@ -1344,7 +1344,7 @@ pfprint_average(dtrace_hdl_t *dtp, FILE *fp, const char *format,
const dt_pfargd_t *pfd, const void *addr, size_t size, uint64_t normal)
{
const uint64_t *data = addr;
- RT_NOREF1(pfd);
+ RT_NOREF(pfd);
if (size != sizeof (uint64_t) * 2)
return (dt_set_errno(dtp, EDT_DMISMATCH));
@@ -1359,7 +1359,7 @@ pfprint_stddev(dtrace_hdl_t *dtp, FILE *fp, const char *format,
const dt_pfargd_t *pfd, const void *addr, size_t size, uint64_t normal)
{
const uint64_t *data = addr;
- RT_NOREF1(pfd);
+ RT_NOREF(pfd);
if (size != sizeof (uint64_t) * 4)
return (dt_set_errno(dtp, EDT_DMISMATCH));
@@ -1373,7 +1373,7 @@ static int
pfprint_quantize(dtrace_hdl_t *dtp, FILE *fp, const char *format,
const dt_pfargd_t *pfd, const void *addr, size_t size, uint64_t normal)
{
- RT_NOREF2(pfd, format);
+ RT_NOREF(pfd, format);
return (dt_print_quantize(dtp, fp, addr, size, normal));
}
@@ -1382,7 +1382,7 @@ static int
pfprint_lquantize(dtrace_hdl_t *dtp, FILE *fp, const char *format,
const dt_pfargd_t *pfd, const void *addr, size_t size, uint64_t normal)
{
- RT_NOREF2(pfd, format);
+ RT_NOREF(pfd, format);
return (dt_print_lquantize(dtp, fp, addr, size, normal));
}
@@ -1670,7 +1670,7 @@ dtrace_system(dtrace_hdl_t *dtp, FILE *fp, void *fmtdata,
uint_t nrecs, const void *buf, size_t len)
{
int rval = dtrace_sprintf(dtp, fp, fmtdata, recp, nrecs, buf, len);
- RT_NOREF1(data);
+ RT_NOREF(data);
if (rval == -1)
return (rval);
@@ -1804,7 +1804,7 @@ dtrace_fprintf(dtrace_hdl_t *dtp, FILE *fp, void *fmtdata,
const dtrace_probedata_t *data, const dtrace_recdesc_t *recp,
uint_t nrecs, const void *buf, size_t len)
{
- RT_NOREF1(data);
+ RT_NOREF(data);
return (dt_printf_format(dtp, fp, fmtdata,
recp, nrecs, buf, len, NULL, 0));
}
@@ -1879,7 +1879,7 @@ dtrace_printf_format(dtrace_hdl_t *dtp, void *fmtdata, char *s, size_t len)
uint_t i;
size_t j;
#endif
- RT_NOREF1(dtp);
+ RT_NOREF(dtp);
for (i = 0; i < pfv->pfv_argc; i++, pfd = pfd->pfd_next) {
const dt_pfconv_t *pfc = pfd->pfd_conv;
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_program.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_program.c
index 33e5a8eb35..0f65a20636 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_program.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_program.c
@@ -90,7 +90,7 @@ dtrace_program_info(dtrace_hdl_t *dtp, dtrace_prog_t *pgp,
dt_stmt_t *stp;
dtrace_actdesc_t *ap;
dtrace_ecbdesc_t *last = NULL;
- RT_NOREF1(dtp);
+ RT_NOREF(dtp);
if (pip == NULL)
return;
@@ -409,7 +409,7 @@ dt_header_decl(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
char *fname;
const char *p;
int i;
- RT_NOREF1(dhp);
+ RT_NOREF(dhp);
p = prp->pr_name;
for (i = 0; (p = strchr(p, '-')) != NULL; i++)
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_provider.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_provider.c
index a0c6bc0067..79df473422 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_provider.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_provider.c
@@ -652,7 +652,7 @@ dt_probe_tag(dt_probe_t *prp, uint_t argn, dt_node_t *dnp)
static int
dt_probe_desc(dtrace_hdl_t *dtp, const dtrace_probedesc_t *pdp, void *arg)
{
- RT_NOREF1(dtp);
+ RT_NOREF(dtp);
if (((dtrace_probedesc_t *)arg)->dtpd_id == DTRACE_IDNONE) {
bcopy(pdp, arg, sizeof (dtrace_probedesc_t));
@@ -812,7 +812,7 @@ static int
dt_probe_iter(dt_idhash_t *ihp, dt_ident_t *idp, dt_probe_iter_t *pit)
{
const dt_probe_t *prp = idp->di_data;
- RT_NOREF1(ihp);
+ RT_NOREF(ihp);
if (!dt_gmatch(prp->pr_name, pit->pit_pat))
return (0); /* continue on and examine next probe in hash */
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
index 830b9f8fba..f220228599 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
@@ -799,7 +799,7 @@ dt_alloc(dtrace_hdl_t *dtp, size_t size)
void
dt_free(dtrace_hdl_t *dtp, void *data)
{
- RT_NOREF1(dtp);
+ RT_NOREF(dtp);
assert(dtp != NULL); /* ensure sane use of this interface */
free(data);
}
@@ -1020,7 +1020,7 @@ dtrace_uaddr2str(dtrace_hdl_t *dtp, pid_t pid,
dt_proc_release(dtp, P);
#else
char c[32];
- RT_NOREF2(dtp, pid);
+ RT_NOREF(dtp, pid);
RTStrPrintf(c, sizeof (c), "0x%llx", addr);
#endif
diff --git a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_xlator.c b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_xlator.c
index dcd846f824..23c19a53e4 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_xlator.c
+++ b/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_xlator.c
@@ -50,7 +50,7 @@ dt_xlator_create_member(const char *name, ctf_id_t type, ulong_t off, void *arg)
dt_xlator_t *dxp = arg;
dtrace_hdl_t *dtp = dxp->dx_hdl;
dt_node_t *enp, *mnp;
- RT_NOREF1(off);
+ RT_NOREF(off);
if ((enp = dt_node_xalloc(dtp, DT_NODE_XLATOR)) == NULL)
return (dt_set_errno(dtp, EDT_NOMEM));
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
index 077cec26e0..f45fd56cbb 100644
--- a/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
+++ b/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
@@ -1253,7 +1253,7 @@ RTEXITCODE errorSyntaxEx(USAGECATEGORY fCategory, uint32_t fSubCategory, const c
else
printUsage(fCategory, fSubCategory, g_pStdErr);
#else
- RT_NOREF2(fCategory, fSubCategory);
+ RT_NOREF(fCategory, fSubCategory);
#endif
va_start(args, pszFormat);
RTStrmPrintf(g_pStdErr, "\nSyntax error: %N\n", pszFormat, &args);
@@ -1306,7 +1306,7 @@ RTEXITCODE errorGetOptEx(USAGECATEGORY fCategory, uint32_t fSubCategory, int rc,
else
printUsage(fCategory, fSubCategory, g_pStdErr);
#else
- RT_NOREF2(fCategory, fSubCategory);
+ RT_NOREF(fCategory, fSubCategory);
#endif
if (rc == VINF_GETOPT_NOT_OPTION)
diff --git a/src/VBox/GuestHost/DragAndDrop/DnDPath.cpp b/src/VBox/GuestHost/DragAndDrop/DnDPath.cpp
index 106f2bf810..efd806f718 100644
--- a/src/VBox/GuestHost/DragAndDrop/DnDPath.cpp
+++ b/src/VBox/GuestHost/DragAndDrop/DnDPath.cpp
@@ -37,7 +37,7 @@ int DnDPathSanitizeFilename(char *pszPath, size_t cbPath)
{
int rc = VINF_SUCCESS;
#ifdef RT_OS_WINDOWS
- RT_NOREF1(cbPath);
+ RT_NOREF(cbPath);
/* Replace out characters not allowed on Windows platforms, put in by RTTimeSpecToString(). */
/** @todo Use something like RTPathSanitize() if available later some time. */
static const RTUNICP s_uszValidRangePairs[] =
@@ -56,7 +56,7 @@ int DnDPathSanitizeFilename(char *pszPath, size_t cbPath)
if (cReplaced < 0)
rc = VERR_INVALID_UTF8_ENCODING;
#else
- RT_NOREF2(pszPath, cbPath);
+ RT_NOREF(pszPath, cbPath);
#endif
return rc;
}
@@ -64,7 +64,7 @@ int DnDPathSanitizeFilename(char *pszPath, size_t cbPath)
int DnDPathSanitize(char *pszPath, size_t cbPath)
{
/** @todo */
- RT_NOREF2(pszPath, cbPath);
+ RT_NOREF(pszPath, cbPath);
return VINF_SUCCESS;
}
diff --git a/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c b/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c
index 47c2a69d03..8dcdf3753c 100644
--- a/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c
+++ b/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c
@@ -52,7 +52,7 @@ void PACK_APIENTRY crPackWindowVisibleRegion( CR_PACKER_CONTEXT_ARGDECL GLint wi
void PACK_APIENTRY crPackWindowVisibleRegionSWAP( CR_PACKER_CONTEXT_ARGDECL GLint window, GLint cRects, const GLint * pRects )
{
- RT_NOREF3(window, cRects, pRects); CR_PACKER_CONTEXT_ARG_NOREF();
+ RT_NOREF(window, cRects, pRects); CR_PACKER_CONTEXT_ARG_NOREF();
crError( "crPackWindowVisibleRegionSWAP unimplemented and shouldn't be called" );
}
diff --git a/src/VBox/GuestHost/OpenGL/util/mem.c b/src/VBox/GuestHost/OpenGL/util/mem.c
index c28c4f5523..f87ebcaa8e 100644
--- a/src/VBox/GuestHost/OpenGL/util/mem.c
+++ b/src/VBox/GuestHost/OpenGL/util/mem.c
@@ -63,7 +63,7 @@ void *crAllocDebug( unsigned int nbytes, const char *file, int line )
fprintf(stderr, "crAllocDebug(%d bytes) in %s at %d\n", nbytes, file, line);
return _crAlloc(nbytes);
#else
- RT_NOREF2(file, line);
+ RT_NOREF(file, line);
return crAlloc(nbytes);
#endif
}
@@ -94,7 +94,7 @@ void *crCallocDebug( unsigned int nbytes, const char *file, int line )
fprintf(stderr, "crCallocDebug(%d bytes) in %s at %d\n", nbytes, file, line);
return _crCalloc(nbytes);
#else
- RT_NOREF2(file, line);
+ RT_NOREF(file, line);
return crCalloc(nbytes);
#endif
}
diff --git a/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp b/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp
index 09a4f85490..215c6c4eca 100644
--- a/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp
+++ b/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp
@@ -337,7 +337,7 @@ void clipQueueToEventThread(CLIPBACKEND *pCtx,
ssize_t cbWritten = write(pCtx->wakeupPipeWrite, WAKE_UP_STRING, WAKE_UP_STRING_LEN);
NOREF(cbWritten);
#else
- RT_NOREF1(pCtx);
+ RT_NOREF(pCtx);
testQueueToEventThread(proc, client_data);
#endif
}
@@ -1188,7 +1188,7 @@ static int clipWinTxtToUtf8ForX11CB(Display *pDisplay, PRTUTF16 pwszSrc,
unsigned long *pcLenReturn,
int *piFormatReturn)
{
- RT_NOREF2(pDisplay, pcLenReturn);
+ RT_NOREF(pDisplay, pcLenReturn);
/* This may slightly overestimate the space needed. */
size_t cbDest = 0;
@@ -1238,7 +1238,7 @@ static int clipWinHTMLToUtf8ForX11CB(Display *pDisplay, const char *pszSrc,
unsigned long *pcLenReturn,
int *piFormatReturn)
{
- RT_NOREF2(pDisplay, pValReturn);
+ RT_NOREF(pDisplay, pValReturn);
/* This may slightly overestimate the space needed. */
LogRelFlowFunc(("source: %s", pszSrc));
@@ -1889,7 +1889,7 @@ static void cbConvertX11CB(Widget widget, XtPointer pClientData,
XtPointer pvSrc, long unsigned int *pcLen,
int *piFormat)
{
- RT_NOREF1(widget);
+ RT_NOREF(widget);
if (*atomType == XT_CONVERT_FAIL) /* Xt timeout */
clipConvertX11CB(pClientData, NULL, 0);
else
@@ -2095,7 +2095,7 @@ static int clipSetVBoxUtf16(CLIPBACKEND *pCtx, int retval,
/* Return the data in the simulated VBox clipboard. */
int ClipRequestDataForX11(VBOXCLIPBOARDCONTEXT *pCtx, uint32_t u32Format, void **ppv, uint32_t *pcb)
{
- RT_NOREF2(pCtx, u32Format);
+ RT_NOREF(pCtx, u32Format);
*pcb = g_vboxDatacb;
if (g_vboxDatapv != NULL)
{
@@ -2129,24 +2129,26 @@ Display *XtOpenDisplay(XtAppContext app_context,
XrmOptionDescRec *options, Cardinal num_options,
int *argc, char **argv)
{
- RT_NOREF8(app_context, display_string, application_name, application_class, options, num_options, argc, argv);
+ RT_NOREF(app_context, display_string, application_name, application_class,
+ options, num_options, argc, argv);
return (Display *)0xffff;
}
Widget XtVaAppCreateShell(_Xconst _XtString application_name, _Xconst _XtString application_class,
WidgetClass widget_class, Display *display, ...)
{
- RT_NOREF4(application_name, application_class, widget_class, display);
+ RT_NOREF(application_name, application_class, widget_class, display);
return TEST_WIDGET;
}
-void XtSetMappedWhenManaged(Widget widget, _XtBoolean mapped_when_managed) { RT_NOREF2(widget, mapped_when_managed); }
+void XtSetMappedWhenManaged(Widget widget, _XtBoolean mapped_when_managed) { RT_NOREF(widget,
+ mapped_when_managed); }
void XtRealizeWidget(Widget widget) { NOREF(widget); }
XtInputId XtAppAddInput(XtAppContext app_context, int source, XtPointer condition, XtInputCallbackProc proc, XtPointer closure)
{
- RT_NOREF5(app_context, source, condition, proc, closure);
+ RT_NOREF(app_context, source, condition, proc, closure);
return 0xffff;
}
@@ -2189,7 +2191,7 @@ static int g_selFormat = 0;
void testRequestData(CLIPBACKEND *pCtx, CLIPX11FORMAT target, void *closure)
{
- RT_NOREF1(pCtx);
+ RT_NOREF(pCtx);
unsigned long count = 0;
int format = 0;
if (target != g_selTargets[0])
@@ -2216,7 +2218,7 @@ static uint32_t g_fX11Formats = 0;
void ClipReportX11Formats(VBOXCLIPBOARDCONTEXT *pCtx, uint32_t u32Formats)
{
- RT_NOREF1(pCtx);
+ RT_NOREF(pCtx);
g_fX11Formats = u32Formats;
}
@@ -2245,7 +2247,7 @@ Boolean XtOwnSelection(Widget widget, Atom selection, Time time,
XtLoseSelectionProc lose,
XtSelectionDoneProc done)
{
- RT_NOREF2(widget, time);
+ RT_NOREF(widget, time);
if (selection != XInternAtom(NULL, "CLIPBOARD", 0))
return True; /* We don't really care about this. */
g_ownsSel = true; /* Always succeed. */
@@ -2257,7 +2259,7 @@ Boolean XtOwnSelection(Widget widget, Atom selection, Time time,
void XtDisownSelection(Widget widget, Atom selection, Time time)
{
- RT_NOREF3(widget, time, selection);
+ RT_NOREF(widget, time, selection);
g_ownsSel = false;
g_pfnSelConvert = NULL;
g_pfnSelLose = NULL;
@@ -2322,7 +2324,7 @@ char *XtMalloc(Cardinal size) { return (char *) RTMemAlloc(size); }
char *XGetAtomName(Display *display, Atom atom)
{
- RT_NOREF1(display);
+ RT_NOREF(display);
AssertReturn((unsigned)atom < RT_ELEMENTS(g_aFormats) + 1, NULL);
const char *pcszName = NULL;
if (atom < 0x1000)
@@ -2364,7 +2366,7 @@ static char g_completedBuf[MAX_BUF_SIZE];
void ClipCompleteDataRequestFromX11(VBOXCLIPBOARDCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
{
- RT_NOREF1(pCtx);
+ RT_NOREF(pCtx);
if (cb <= MAX_BUF_SIZE)
{
g_completedRC = rc;
@@ -2517,7 +2519,7 @@ static void testLatin1FromX11(RTTEST hTest, CLIPBACKEND *pCtx,
static void testStringFromVBox(RTTEST hTest, CLIPBACKEND *pCtx, const char *pcszTarget, Atom typeExp, const char *valueExp)
{
- RT_NOREF1(pCtx);
+ RT_NOREF(pCtx);
bool retval = false;
Atom type;
XtPointer value = NULL;
@@ -2558,7 +2560,7 @@ static void testNoX11(CLIPBACKEND *pCtx, const char *pcszTestCtx)
static void testStringFromVBoxFailed(RTTEST hTest, CLIPBACKEND *pCtx, const char *pcszTarget)
{
- RT_NOREF1(pCtx);
+ RT_NOREF(pCtx);
Atom type;
XtPointer value = NULL;
unsigned long length;
@@ -2573,7 +2575,7 @@ static void testStringFromVBoxFailed(RTTEST hTest, CLIPBACKEND *pCtx, const char
static void testNoSelectionOwnership(CLIPBACKEND *pCtx, const char *pcszTestCtx)
{
- RT_NOREF1(pCtx);
+ RT_NOREF(pCtx);
RTTESTI_CHECK_MSG(!g_ownsSel, ("context: %s\n", pcszTestCtx));
}
@@ -2860,18 +2862,18 @@ int main()
int ClipRequestDataForX11(VBOXCLIPBOARDCONTEXT *pCtx, uint32_t u32Format, void **ppv, uint32_t *pcb)
{
- RT_NOREF4(pCtx, u32Format, ppv, pcb);
+ RT_NOREF(pCtx, u32Format, ppv, pcb);
return VERR_NO_DATA;
}
void ClipReportX11Formats(VBOXCLIPBOARDCONTEXT *pCtx, uint32_t u32Formats)
{
- RT_NOREF2(pCtx, u32Formats);
+ RT_NOREF(pCtx, u32Formats);
}
void ClipCompleteDataRequestFromX11(VBOXCLIPBOARDCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
{
- RT_NOREF5(pCtx, rc, pReq, pv, cb);
+ RT_NOREF(pCtx, rc, pReq, pv, cb);
}
int main()
diff --git a/src/VBox/HostDrivers/Support/SUPDrv.cpp b/src/VBox/HostDrivers/Support/SUPDrv.cpp
index 4d701bcaa9..f9687a9cd6 100644
--- a/src/VBox/HostDrivers/Support/SUPDrv.cpp
+++ b/src/VBox/HostDrivers/Support/SUPDrv.cpp
@@ -5790,7 +5790,7 @@ static int supdrvIOCtl_CallServiceModule(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION p
rc, pReq->u.In.uOperation, pReq->Hdr.cbOut, pReq->u.In.u64Arg, RTProcSelf(), RTThreadNativeSelf()));
return rc;
#else /* RT_OS_WINDOWS && !RT_ARCH_AMD64 && !DEBUG */
- RT_NOREF3(pDevExt, pSession, pReq);
+ RT_NOREF(pDevExt, pSession, pReq);
return VERR_NOT_IMPLEMENTED;
#endif /* RT_OS_WINDOWS && !RT_ARCH_AMD64 && !DEBUG */
}
@@ -5980,10 +5980,10 @@ static int supdrvIOCtl_MsrProber(PSUPDRVDEVEXT pDevExt, PSUPMSRPROBER pReq)
default:
return VERR_INVALID_FUNCTION;
}
- RT_NOREF1(pDevExt);
+ RT_NOREF(pDevExt);
return rc;
#else
- RT_NOREF2(pDevExt, pReq);
+ RT_NOREF(pDevExt, pReq);
return VERR_NOT_IMPLEMENTED;
#endif
}
diff --git a/src/VBox/HostDrivers/Support/SUPDrvGip.cpp b/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
index c65f6deb8b..d2947d01e4 100644
--- a/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
+++ b/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
@@ -2997,7 +2997,7 @@ static bool supdrvTscDeltaSync2_After(PSUPTSCDELTASYNC2 pMySync, PSUPTSCDELTASYN
bool fIsMaster, RTCCUINTREG fEFlags)
{
TSCDELTA_DBG_VARS();
- RT_NOREF1(pOtherSync);
+ RT_NOREF(pOtherSync);
/*
* Wait for the 'ready' signal. In the master's case, this means the
@@ -3322,7 +3322,7 @@ static void supdrvTscDeltaMethod2Loop(PSUPDRVGIPTSCDELTARGS pArgs, PSUPTSCDELTAS
bool fIsMaster, uint32_t iTry)
{
unsigned iLoop;
- RT_NOREF1(iTry);
+ RT_NOREF(iTry);
for (iLoop = 0; iLoop < GIP_TSC_DELTA_M2_LOOPS; iLoop++)
{
@@ -4699,7 +4699,7 @@ int VBOXCALL supdrvIOCtl_TscDeltaMeasure(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION p
uint32_t iCpuSet;
uint32_t fFlags;
RTMSINTERVAL cMsWaitRetry;
- RT_NOREF1(pDevExt);
+ RT_NOREF(pDevExt);
/*
* Validate and adjust/resolve the input so they can be passed onto SUPR0TscDeltaMeasureBySetIndex.
diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp
index 1bdaa2b2e5..3b712a9e03 100644
--- a/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp
+++ b/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp
@@ -2323,7 +2323,7 @@ static int supR3HardenedMainGetTrustedLib(const char *pszProgName, uint32_t fMai
if (fMainFlags & SUPSECMAIN_FLAGS_OSX_VM_APP)
pszProgName = "VirtualBox";
#else
- RT_NOREF1(fMainFlags);
+ RT_NOREF(fMainFlags);
#endif
size_t cch = suplibHardenedStrLen(pszPath);
return suplibHardenedStrCopyEx(&pszPath[cch], cbPath - cch, pszSubDirSlash, pszProgName, SUPLIB_DLL_SUFF, NULL);
diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
index 5af6a47475..d8d48381cd 100644
--- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
+++ b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
@@ -622,7 +622,7 @@ static int supR3HardenedVerifyFileSignature(PCSUPINSTFILE pFile, PSUPVERIFIEDFIL
return rc;
# else /* Not checking signatures. */
- RT_NOREF4(pFile, pVerified, fFatal, fLeaveFileOpen);
+ RT_NOREF(pFile, pVerified, fFatal, fLeaveFileOpen);
return VINF_SUCCESS;
# endif /* Not checking signatures. */
}
@@ -645,7 +645,7 @@ static int supR3HardenedVerifyFileSignature(PCSUPINSTFILE pFile, PSUPVERIFIEDFIL
static int supR3HardenedVerifyFileInternal(int iFile, bool fFatal, bool fLeaveFileOpen, bool fVerifyAll)
{
#ifndef RT_OS_WINDOWS
- RT_NOREF1(fVerifyAll);
+ RT_NOREF(fVerifyAll);
#endif
PCSUPINSTFILE pFile = &g_aSupInstallFiles[iFile];
PSUPVERIFIEDFILE pVerified = &g_aSupVerifiedFiles[iFile];
@@ -1293,7 +1293,7 @@ static int supR3HardenedQueryFsObjectByPath(char const *pszPath, PSUPR3HARDENEDF
#if defined(RT_OS_WINDOWS)
/** @todo Windows hardening. */
pFsObjState->chTodo = 0;
- RT_NOREF2(pszPath, pErrInfo);
+ RT_NOREF(pszPath, pErrInfo);
return VINF_SUCCESS;
#else
@@ -1336,7 +1336,7 @@ static int supR3HardenedQueryFsObjectByHandle(RTHCUINTPTR hNative, PSUPR3HARDENE
#if defined(RT_OS_WINDOWS)
/** @todo Windows hardening. */
pFsObjState->chTodo = 0;
- RT_NOREF3(hNative, pszPath, pErrInfo);
+ RT_NOREF(hNative, pszPath, pErrInfo);
return VINF_SUCCESS;
#else
@@ -1373,11 +1373,11 @@ static int supR3HardenedIsSameFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState1, P
{
#if defined(RT_OS_WINDOWS)
/** @todo Windows hardening. */
- RT_NOREF4(pFsObjState1, pFsObjState2, pszPath, pErrInfo);
+ RT_NOREF(pFsObjState1, pFsObjState2, pszPath, pErrInfo);
return VINF_SUCCESS;
#elif defined(RT_OS_OS2)
- RT_NOREF4(pFsObjState1, pFsObjState2, pszPath, pErrInfo);
+ RT_NOREF(pFsObjState1, pFsObjState2, pszPath, pErrInfo);
return VINF_SUCCESS;
#else
diff --git a/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp b/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp
index 208d3db560..69a9e0ce7e 100644
--- a/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp
+++ b/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp
@@ -77,7 +77,7 @@
int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited, bool fUnrestricted, SUPINITOP *penmWhat, PRTERRINFO pErrInfo)
{
- RT_NOREF2(penmWhat, pErrInfo);
+ RT_NOREF(penmWhat, pErrInfo);
/*
* Nothing to do if pre-inited.
diff --git a/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp b/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp
index 13c847d1df..2b32aeb1bb 100644
--- a/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp
+++ b/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp
@@ -572,7 +572,7 @@ static void vboxdrvNtDestroyDevices(void)
*/
NTSTATUS _stdcall DriverEntry(PDRIVER_OBJECT pDrvObj, PUNICODE_STRING pRegPath)
{
- RT_NOREF1(pRegPath);
+ RT_NOREF(pRegPath);
/*
* Sanity checks.
@@ -1529,7 +1529,7 @@ NTSTATUS _stdcall VBoxDrvNtInternalDeviceControl(PDEVICE_OBJECT pDevObj, PIRP pI
NTSTATUS _stdcall VBoxDrvNtRead(PDEVICE_OBJECT pDevObj, PIRP pIrp)
{
Log(("VBoxDrvNtRead\n"));
- RT_NOREF1(pDevObj);
+ RT_NOREF(pDevObj);
NTSTATUS rcNt;
pIrp->IoStatus.Information = 0;
@@ -1664,7 +1664,7 @@ NTSTATUS _stdcall VBoxDrvNtNotSupportedStub(PDEVICE_OBJECT pDevObj, PIRP pIrp)
*/
VOID _stdcall VBoxPowerDispatchCallback(PVOID pCallbackContext, PVOID pvArgument1, PVOID pvArgument2)
{
- /*PDEVICE_OBJECT pDevObj = (PDEVICE_OBJECT)pCallbackContext;*/ RT_NOREF1(pCallbackContext);
+ /*PDEVICE_OBJECT pDevObj = (PDEVICE_OBJECT)pCallbackContext;*/ RT_NOREF(pCallbackContext);
Log(("VBoxPowerDispatchCallback: %x %x\n", pvArgument1, pvArgument2));
/* Power change imminent? */
@@ -1695,9 +1695,9 @@ void VBOXCALL supdrvOSCleanupSession(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSess
supdrvNtProtectRelease(pSession->pNtProtect);
pSession->pNtProtect = NULL;
}
- RT_NOREF1(pDevExt);
+ RT_NOREF(pDevExt);
#else
- RT_NOREF2(pDevExt, pSession);
+ RT_NOREF(pDevExt, pSession);
#endif
}
@@ -1847,7 +1847,7 @@ bool VBOXCALL supdrvOSObjCanAccess(PSUPDRVOBJ pObj, PSUPDRVSESSION pSession, c
*/
bool VBOXCALL supdrvOSGetForcedAsyncTscMode(PSUPDRVDEVEXT pDevExt)
{
- RT_NOREF1(pDevExt);
+ RT_NOREF(pDevExt);
return g_Options.fOptForceAsyncTsc != 0;
}
@@ -3006,7 +3006,7 @@ static bool supdrvNtProtectIsAssociatedCsrss(PSUPDRVNTPROTECT pNtProtect, PEPROC
*/
static bool supdrvNtProtectIsFrigginThemesService(PSUPDRVNTPROTECT pNtProtect, PEPROCESS pAnnoyingProcess)
{
- RT_NOREF1(pNtProtect);
+ RT_NOREF(pNtProtect);
/*
* Check the process name.
@@ -3353,7 +3353,7 @@ supdrvNtProtectCallback_ProcessCreateNotify(HANDLE hParentPid, HANDLE hNewPid, B
static VOID __stdcall
supdrvNtProtectCallback_ProcessCreateNotifyEx(PEPROCESS pNewProcess, HANDLE hNewPid, PPS_CREATE_NOTIFY_INFO pInfo)
{
- RT_NOREF1(pNewProcess);
+ RT_NOREF(pNewProcess);
/*
* Is it a new process that needs protection?
@@ -3436,7 +3436,7 @@ AssertCompile((SUPDRV_NT_ALLOW_PROCESS_RIGHTS & SUPDRV_NT_EVIL_PROCESS_RIGHTS) =
static OB_PREOP_CALLBACK_STATUS __stdcall
supdrvNtProtectCallback_ProcessHandlePre(PVOID pvUser, POB_PRE_OPERATION_INFORMATION pOpInfo)
{
- Assert(pvUser == NULL); RT_NOREF1(pvUser);
+ Assert(pvUser == NULL); RT_NOREF(pvUser);
Assert(pOpInfo->Operation == OB_OPERATION_HANDLE_CREATE || pOpInfo->Operation == OB_OPERATION_HANDLE_DUPLICATE);
Assert(pOpInfo->ObjectType == *PsProcessType);
@@ -3688,7 +3688,7 @@ supdrvNtProtectCallback_ProcessHandlePre(PVOID pvUser, POB_PRE_OPERATION_INFORMA
static VOID __stdcall
supdrvNtProtectCallback_ProcessHandlePost(PVOID pvUser, POB_POST_OPERATION_INFORMATION pOpInfo)
{
- Assert(pvUser == NULL); RT_NOREF1(pvUser);
+ Assert(pvUser == NULL); RT_NOREF(pvUser);
Assert(pOpInfo->Operation == OB_OPERATION_HANDLE_CREATE || pOpInfo->Operation == OB_OPERATION_HANDLE_DUPLICATE);
Assert(pOpInfo->ObjectType == *PsProcessType);
@@ -3750,7 +3750,7 @@ AssertCompile((SUPDRV_NT_EVIL_THREAD_RIGHTS & SUPDRV_NT_ALLOWED_THREAD_RIGHTS) =
static OB_PREOP_CALLBACK_STATUS __stdcall
supdrvNtProtectCallback_ThreadHandlePre(PVOID pvUser, POB_PRE_OPERATION_INFORMATION pOpInfo)
{
- Assert(pvUser == NULL); RT_NOREF1(pvUser);
+ Assert(pvUser == NULL); RT_NOREF(pvUser);
Assert(pOpInfo->Operation == OB_OPERATION_HANDLE_CREATE || pOpInfo->Operation == OB_OPERATION_HANDLE_DUPLICATE);
Assert(pOpInfo->ObjectType == *PsThreadType);
@@ -3898,7 +3898,7 @@ supdrvNtProtectCallback_ThreadHandlePre(PVOID pvUser, POB_PRE_OPERATION_INFORMAT
static VOID __stdcall
supdrvNtProtectCallback_ThreadHandlePost(PVOID pvUser, POB_POST_OPERATION_INFORMATION pOpInfo)
{
- Assert(pvUser == NULL); RT_NOREF1(pvUser);
+ Assert(pvUser == NULL); RT_NOREF(pvUser);
Assert(pOpInfo->Operation == OB_OPERATION_HANDLE_CREATE || pOpInfo->Operation == OB_OPERATION_HANDLE_DUPLICATE);
Assert(pOpInfo->ObjectType == *PsThreadType);
diff --git a/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp b/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp
index 9a84dfd378..75bfcbfe97 100644
--- a/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp
+++ b/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp
@@ -507,7 +507,7 @@ static bool supHardNtViCheckIsOwnedByTrustedInstallerOrSimilar(HANDLE hFile, PCR
SUP_DPRINTF(("%ls: Owner is not trusted installer (%.*Rhxs)\n",
pwszName, ((uint8_t *)pOwner)[1] /*SubAuthorityCount*/ * sizeof(ULONG) + 8, pOwner));
- RT_NOREF1(pwszName);
+ RT_NOREF(pwszName);
return false;
}
@@ -748,7 +748,7 @@ DECLHIDDEN(bool) supHardViIsAppPatchDir(PCRTUTF16 pwszPath, uint32_t cwcName)
*/
static int supHardNtViCheckIfNotSignedOk(RTLDRMOD hLdrMod, PCRTUTF16 pwszName, uint32_t fFlags, HANDLE hFile, int rc)
{
- RT_NOREF1(hLdrMod);
+ RT_NOREF(hLdrMod);
if (fFlags & (SUPHNTVI_F_REQUIRE_BUILD_CERT | SUPHNTVI_F_REQUIRE_KERNEL_CODE_SIGNING))
return rc;
@@ -1570,7 +1570,7 @@ static int supHardNtViCertStoreInit(PRTCRSTORE phStore,
PRTERRINFO pErrInfo, const char *pszErrorTag)
{
AssertReturn(*phStore == NIL_RTCRSTORE, VERR_WRONG_ORDER);
- RT_NOREF1(pszErrorTag);
+ RT_NOREF(pszErrorTag);
int rc = RTCrStoreCreateInMem(phStore, cCerts1 + cCerts2);
if (RT_FAILURE(rc))
@@ -2318,7 +2318,7 @@ static int supR3HardNtViNtToWinPath(PCRTUTF16 pwszNtName, PCRTUTF16 *ppwszWinPat
static int supR3HardNtViCallWinVerifyTrust(HANDLE hFile, PCRTUTF16 pwszName, uint32_t fFlags, PRTERRINFO pErrInfo,
PFNWINVERIFYTRUST pfnWinVerifyTrust, HRESULT *phrcWinVerifyTrust)
{
- RT_NOREF1(fFlags);
+ RT_NOREF(fFlags);
if (phrcWinVerifyTrust)
*phrcWinVerifyTrust = S_OK;
@@ -2443,7 +2443,7 @@ static int supR3HardNtViCallWinVerifyTrust(HANDLE hFile, PCRTUTF16 pwszName, uin
static int supR3HardNtViCallWinVerifyTrustCatFile(HANDLE hFile, PCRTUTF16 pwszName, uint32_t fFlags, PRTERRINFO pErrInfo,
PFNWINVERIFYTRUST pfnWinVerifyTrust)
{
- RT_NOREF1(fFlags);
+ RT_NOREF(fFlags);
SUP_DPRINTF(("supR3HardNtViCallWinVerifyTrustCatFile: hFile=%p pwszName=%ls\n", hFile, pwszName));
/*
diff --git a/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyProcess-win.cpp b/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyProcess-win.cpp
index 10eb36a175..b863e99ee1 100644
--- a/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyProcess-win.cpp
+++ b/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyProcess-win.cpp
@@ -358,7 +358,7 @@ static NTSTATUS supHardNtVpReadMem(HANDLE hProcess, uintptr_t uPtr, void *pvBuf,
{
#ifdef IN_RING0
/* ASSUMES hProcess is the current process. */
- RT_NOREF1(hProcess);
+ RT_NOREF(hProcess);
/** @todo use MmCopyVirtualMemory where available! */
int rc = RTR0MemUserCopyFrom(pvBuf, uPtr, cbRead);
if (RT_SUCCESS(rc))
@@ -412,7 +412,7 @@ static int supHardNtVpFileMemCompareSection(PSUPHNTVPSTATE pThis, PSUPHNTVPIMAGE
uint32_t fCorrectProtection)
{
#ifndef IN_RING3
- RT_NOREF1(fCorrectProtection);
+ RT_NOREF(fCorrectProtection);
#endif
AssertCompileAdjacentMembers(SUPHNTVPSTATE, abMemory, abFile); /* Use both the memory and file buffers here. Parfait might hate me for this... */
uint32_t const cbMemory = sizeof(pThis->abMemory) + sizeof(pThis->abFile);
diff --git a/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp b/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp
index 7ade57892c..e872a93c17 100644
--- a/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp
+++ b/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp
@@ -260,7 +260,7 @@ int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited, bool fUnrestricted, SUPINIT
pErrInfo->pszMsg[0] = '\0';
}
#else
- RT_NOREF1(penmWhat);
+ RT_NOREF(penmWhat);
#endif
return rc;
}
@@ -664,7 +664,7 @@ int suplibOsTerm(PSUPLIBDATA pThis)
int suplibOsIOCtl(PSUPLIBDATA pThis, uintptr_t uFunction, void *pvReq, size_t cbReq)
{
- RT_NOREF1(cbReq);
+ RT_NOREF(cbReq);
/*
* Issue the device I/O control.
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp
index ed86da8910..7b9e0acf54 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp
@@ -534,7 +534,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinRenameConnection(LPWSTR pGuid, PCWSTR N
static BOOL vboxNetCfgWinRemoveAllNetDevicesOfIdCallback(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pDev, PVOID pvContext)
{
- RT_NOREF1(pvContext);
+ RT_NOREF(pvContext);
SP_REMOVEDEVICE_PARAMS rmdParams;
memset(&rmdParams, 0, sizeof(SP_REMOVEDEVICE_PARAMS));
rmdParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER);
@@ -2362,7 +2362,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinGenHostonlyConnectionName(PCWSTR DevNam
static BOOL vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority(IN INetCfg *pNc, IN INetCfgComponent *pNcc, PVOID pContext)
{
- RT_NOREF1(pNc);
+ RT_NOREF(pNc);
INetCfgComponentBindings *pNetCfgBindings;
GUID *pGuid = (GUID*)pContext;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp
index ec6667f5ff..561c3a1b42 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp
@@ -35,7 +35,7 @@ static NDIS_STATUS vboxNetFltWinMpInitialize(OUT PNDIS_STATUS OpenErrorStatus,
IN NDIS_HANDLE MiniportAdapterHandle,
IN NDIS_HANDLE WrapperConfigurationContext)
{
- RT_NOREF1(WrapperConfigurationContext);
+ RT_NOREF(WrapperConfigurationContext);
PVBOXNETFLTINS pNetFlt = (PVBOXNETFLTINS)NdisIMGetDeviceContext(MiniportAdapterHandle);
NDIS_STATUS Status = NDIS_STATUS_FAILURE;
@@ -170,7 +170,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetFltWinMpDoDeinitialization(PVBOXNETFLTINS pNetFlt
static NDIS_STATUS vboxNetFltWinMpReadApplyConfig(PVBOXNETFLTINS pThis, NDIS_HANDLE hMiniportAdapter,
NDIS_HANDLE hWrapperConfigurationContext)
{
- RT_NOREF1(hMiniportAdapter);
+ RT_NOREF(hMiniportAdapter);
NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
NDIS_HANDLE hConfiguration;
PNDIS_CONFIGURATION_PARAMETER pParameterValue;
@@ -1392,7 +1392,8 @@ static NDIS_STATUS vboxNetFltWinMpTransferData(OUT PNDIS_PACKET Packet,
return Status;
#else
- RT_NOREF6(Packet, BytesTransferred, hContext, MiniportReceiveContext, ByteOffset, BytesToTransfer);
+ RT_NOREF(Packet, BytesTransferred, hContext, MiniportReceiveContext,
+ ByteOffset, BytesToTransfer);
LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", hContext));
/* should never be here */
AssertFailed();
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp
index a8c4a1159d..260d084761 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp
@@ -121,7 +121,7 @@ static VOID vboxNetFltWinPtBindAdapter(OUT PNDIS_STATUS pStatus,
IN PVOID pvSystemSpecific2)
{
LogFlowFuncEnter();
- RT_NOREF2(hBindContext, pvSystemSpecific2);
+ RT_NOREF(hBindContext, pvSystemSpecific2);
NDIS_STATUS Status;
NDIS_HANDLE hConfig = NULL;
@@ -152,7 +152,7 @@ static VOID vboxNetFltWinPtBindAdapter(OUT PNDIS_STATUS pStatus,
static VOID vboxNetFltWinPtOpenAdapterComplete(IN NDIS_HANDLE hProtocolBindingContext, IN NDIS_STATUS Status, IN NDIS_STATUS OpenErrorStatus)
{
PVBOXNETFLTINS pNetFlt = (PVBOXNETFLTINS)hProtocolBindingContext;
- RT_NOREF1(OpenErrorStatus);
+ RT_NOREF(OpenErrorStatus);
LogFlowFunc(("ENTER: pNetFlt (0x%p), Status (0x%x), OpenErrorStatus(0x%x)\n", pNetFlt, Status, OpenErrorStatus));
Assert(pNetFlt->u.s.WinIf.OpenCloseStatus == NDIS_STATUS_SUCCESS);
@@ -264,7 +264,7 @@ static VOID vboxNetFltWinPtUnbindAdapter(OUT PNDIS_STATUS pStatus,
IN NDIS_HANDLE hUnbindContext)
{
PVBOXNETFLTINS pNetFlt = (PVBOXNETFLTINS)hContext;
- RT_NOREF1(hUnbindContext);
+ RT_NOREF(hUnbindContext);
LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", pNetFlt));
@@ -301,7 +301,7 @@ static VOID vboxNetFltWinPtCloseAdapterComplete(IN NDIS_HANDLE ProtocolBindingCo
static VOID vboxNetFltWinPtResetComplete(IN NDIS_HANDLE hProtocolBindingContext, IN NDIS_STATUS Status)
{
- RT_NOREF2(hProtocolBindingContext, Status);
+ RT_NOREF(hProtocolBindingContext, Status);
LogFlowFunc(("ENTER: pNetFlt 0x%p, Status 0x%x\n", hProtocolBindingContext, Status));
/*
* should never be here
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp
index 5431e0b8c9..a96667e272 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp
@@ -2689,7 +2689,7 @@ static NDIS_STATUS vboxNetFltWinDisconnectIt(PVBOXNETFLTINS pInstance)
#ifndef VBOXNETFLT_NO_PACKET_QUEUE
vboxNetFltWinQuFiniPacketQueue(pInstance);
#else
- RT_NOREF1(pInstance);
+ RT_NOREF(pInstance);
#endif
return NDIS_STATUS_SUCCESS;
}
@@ -2789,7 +2789,7 @@ static bool vboxNetFltWinIsPromiscuous2(PVBOXNETFLTINS pThis)
}
return false;
#else
- RT_NOREF1(pThis);
+ RT_NOREF(pThis);
return true;
#endif
}
@@ -2960,7 +2960,7 @@ static int vboxNetFltWinAttachToInterface(PVBOXNETFLTINS pThis, void * pContext,
}
static NTSTATUS vboxNetFltWinPtDevDispatch(IN PDEVICE_OBJECT pDevObj, IN PIRP pIrp)
{
- RT_NOREF1(pDevObj);
+ RT_NOREF(pDevObj);
PIO_STACK_LOCATION pIrpSl = IoGetCurrentIrpStackLocation(pIrp);;
NTSTATUS Status = STATUS_SUCCESS;
@@ -3108,7 +3108,7 @@ bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThis)
int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, uint32_t fDst)
{
- RT_NOREF1(pvIfData);
+ RT_NOREF(pvIfData);
int rc = VINF_SUCCESS;
uint32_t cRefs = 0;
#ifndef VBOXNETADP
@@ -3419,7 +3419,7 @@ void vboxNetFltWinAddAddressHandler(PTA_ADDRESS Address,
PUNICODE_STRING DeviceName,
PTDI_PNP_CONTEXT Context)
{
- RT_NOREF2(DeviceName, Context);
+ RT_NOREF(DeviceName, Context);
vboxNetFltWinNotifyHostAddress(Address, true);
}
@@ -3427,7 +3427,7 @@ void vboxNetFltWinDelAddressHandler(PTA_ADDRESS Address,
PUNICODE_STRING DeviceName,
PTDI_PNP_CONTEXT Context)
{
- RT_NOREF2(DeviceName, Context);
+ RT_NOREF(DeviceName, Context);
vboxNetFltWinNotifyHostAddress(Address, false);
}
@@ -3622,19 +3622,19 @@ int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
void vboxNetFltPortOsNotifyMacAddress(PVBOXNETFLTINS pThis, void *pvIfData, PCRTMAC pMac)
{
- RT_NOREF3(pThis, pvIfData, pMac);
+ RT_NOREF(pThis, pvIfData, pMac);
}
int vboxNetFltPortOsConnectInterface(PVBOXNETFLTINS pThis, void *pvIf, void **ppvIfData)
{
/* Nothing to do */
- RT_NOREF3(pThis, pvIf, ppvIfData);
+ RT_NOREF(pThis, pvIf, ppvIfData);
return VINF_SUCCESS;
}
int vboxNetFltPortOsDisconnectInterface(PVBOXNETFLTINS pThis, void *pvIfData)
{
/* Nothing to do */
- RT_NOREF2(pThis, pvIfData);
+ RT_NOREF(pThis, pvIfData);
return VINF_SUCCESS;
}
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp
index df6bdcab04..f7cef7311d 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp
@@ -921,7 +921,7 @@ static NDIS_STATUS vboxNetLwfWinSetPacketFilter(PVBOXNETLWF_MODULE pModuleCtx, b
static NTSTATUS vboxNetLwfWinDevDispatch(IN PDEVICE_OBJECT pDevObj, IN PIRP pIrp)
{
- RT_NOREF1(pDevObj);
+ RT_NOREF(pDevObj);
PIO_STACK_LOCATION pIrpSl = IoGetCurrentIrpStackLocation(pIrp);;
NTSTATUS Status = STATUS_SUCCESS;
@@ -1241,7 +1241,7 @@ static VOID vboxNetLwfWinDetach(IN NDIS_HANDLE hModuleCtx)
static NDIS_STATUS vboxNetLwfWinPause(IN NDIS_HANDLE hModuleCtx, IN PNDIS_FILTER_PAUSE_PARAMETERS pParameters)
{
- RT_NOREF1(pParameters);
+ RT_NOREF(pParameters);
LogFlow(("==>vboxNetLwfWinPause: module=%p\n", hModuleCtx));
PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
vboxNetLwfWinChangeState(pModuleCtx, LwfState_Pausing, LwfState_Running);
@@ -1276,7 +1276,7 @@ static void vboxNetLwfWinIndicateOffload(PVBOXNETLWF_MODULE pModuleCtx, PNDIS_OF
static NDIS_STATUS vboxNetLwfWinRestart(IN NDIS_HANDLE hModuleCtx, IN PNDIS_FILTER_RESTART_PARAMETERS pParameters)
{
- RT_NOREF1(pParameters);
+ RT_NOREF(pParameters);
LogFlow(("==>vboxNetLwfWinRestart: module=%p\n", hModuleCtx));
PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
vboxNetLwfWinChangeState(pModuleCtx, LwfState_Restarting, LwfState_Paused);
@@ -2113,7 +2113,7 @@ NTSTATUS DriverEntry(IN PDRIVER_OBJECT pDriverObject, IN PUNICODE_STRING pRegist
static VOID vboxNetLwfWinUnloadDriver(IN PDRIVER_OBJECT pDriver)
{
- RT_NOREF1(pDriver);
+ RT_NOREF(pDriver);
LogFlow(("==>vboxNetLwfWinUnloadDriver: driver=%p\n", pDriver));
vboxNetLwfWinDevDestroy(&g_VBoxNetLwfGlobals);
NdisFDeregisterFilterDriver(g_VBoxNetLwfGlobals.hFilterDriver);
@@ -2268,7 +2268,7 @@ bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThis)
int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, uint32_t fDst)
{
- RT_NOREF1(pvIfData);
+ RT_NOREF(pvIfData);
int rc = VINF_SUCCESS;
PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)pThis->u.s.WinIf.hModuleCtx;
@@ -2363,7 +2363,7 @@ NDIS_IO_WORKITEM_FUNCTION vboxNetLwfWinToggleOffloading;
VOID vboxNetLwfWinToggleOffloading(PVOID WorkItemContext, NDIS_HANDLE NdisIoWorkItemHandle)
{
/* WARNING! Call this with IRQL=Passive! */
- RT_NOREF1(NdisIoWorkItemHandle);
+ RT_NOREF(NdisIoWorkItemHandle);
PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)WorkItemContext;
if (ASMAtomicReadBool(&pModuleCtx->fActive))
@@ -2425,7 +2425,7 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, bool fActive)
int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis)
{
- RT_NOREF1(pThis);
+ RT_NOREF(pThis);
LogFlow(("==>vboxNetFltOsDisconnectIt: instance=%p\n", pThis));
LogFlow(("<==vboxNetFltOsDisconnectIt: return 0\n"));
return VINF_SUCCESS;
@@ -2433,7 +2433,7 @@ int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis)
int vboxNetFltOsConnectIt(PVBOXNETFLTINS pThis)
{
- RT_NOREF1(pThis);
+ RT_NOREF(pThis);
LogFlow(("==>vboxNetFltOsConnectIt: instance=%p\n", pThis));
LogFlow(("<==vboxNetFltOsConnectIt: return 0\n"));
return VINF_SUCCESS;
@@ -2581,7 +2581,7 @@ static void vboxNetLwfWinReportCapabilities(PVBOXNETFLTINS pThis, PVBOXNETLWF_MO
int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
{
- RT_NOREF1(pvContext);
+ RT_NOREF(pvContext);
LogFlow(("==>vboxNetFltOsInitInstance: instance=%p context=%p\n", pThis, pvContext));
AssertReturn(pThis, VERR_INVALID_PARAMETER);
Log(("vboxNetFltOsInitInstance: trunk name=%s\n", pThis->szName));
@@ -2619,14 +2619,14 @@ int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
void vboxNetFltPortOsNotifyMacAddress(PVBOXNETFLTINS pThis, void *pvIfData, PCRTMAC pMac)
{
- RT_NOREF3(pThis, pvIfData, pMac);
+ RT_NOREF(pThis, pvIfData, pMac);
LogFlow(("==>vboxNetFltPortOsNotifyMacAddress: instance=%p data=%p mac=%RTmac\n", pThis, pvIfData, pMac));
LogFlow(("<==vboxNetFltPortOsNotifyMacAddress\n"));
}
int vboxNetFltPortOsConnectInterface(PVBOXNETFLTINS pThis, void *pvIf, void **ppvIfData)
{
- RT_NOREF3(pThis, pvIf, ppvIfData);
+ RT_NOREF(pThis, pvIf, ppvIfData);
LogFlow(("==>vboxNetFltPortOsConnectInterface: instance=%p if=%p data=%p\n", pThis, pvIf, ppvIfData));
LogFlow(("<==vboxNetFltPortOsConnectInterface: return 0\n"));
/* Nothing to do */
@@ -2635,7 +2635,7 @@ int vboxNetFltPortOsConnectInterface(PVBOXNETFLTINS pThis, void *pvIf, void **pp
int vboxNetFltPortOsDisconnectInterface(PVBOXNETFLTINS pThis, void *pvIfData)
{
- RT_NOREF2(pThis, pvIfData);
+ RT_NOREF(pThis, pvIfData);
LogFlow(("==>vboxNetFltPortOsDisconnectInterface: instance=%p data=%p\n", pThis, pvIfData));
LogFlow(("<==vboxNetFltPortOsDisconnectInterface: return 0\n"));
/* Nothing to do */
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp
index e940ee82d7..9443c5a40e 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp
@@ -102,7 +102,7 @@ STDMETHODIMP VBoxNetFltNobj::ApplyRegistryChanges()
STDMETHODIMP VBoxNetFltNobj::ApplyPnpChanges(IN INetCfgPnpReconfigCallback *pCallback)
{
- RT_NOREF1(pCallback);
+ RT_NOREF(pCallback);
return S_OK;
}
@@ -545,7 +545,7 @@ STDMETHODIMP VBoxNetFltNobj::NotifyBindingPath(IN DWORD dwChangeFlag, IN INetCfg
STDMETHODIMP VBoxNetFltNobj::QueryBindingPath(IN DWORD dwChangeFlag, IN INetCfgBindingPath *pNetCfgBP)
{
- RT_NOREF1(dwChangeFlag);
+ RT_NOREF(dwChangeFlag);
if (vboxNetFltWinNotifyShouldBind(pNetCfgBP))
return S_OK;
return NETCFG_S_DISABLE_QUERY;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp
index 7fcec2a325..e319b959f7 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp
@@ -84,6 +84,6 @@ static int VBoxNetAdpUninstall()
int __cdecl main(int argc, char **argv)
{
- RT_NOREF2(argc, argv);
+ RT_NOREF(argc, argv);
return VBoxNetAdpUninstall();
}
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp
index 47634150c4..2e70cb7fb4 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp
@@ -178,6 +178,6 @@ static int VBoxNetFltInstall()
int __cdecl main(int argc, char **argv)
{
- RT_NOREF2(argc, argv);
+ RT_NOREF(argc, argv);
return VBoxNetFltInstall();
}
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp
index ec04c96511..3dd9194916 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp
@@ -108,6 +108,6 @@ static int VBoxNetFltUninstall()
int __cdecl main(int argc, char **argv)
{
- RT_NOREF2(argc, argv);
+ RT_NOREF(argc, argv);
return VBoxNetFltUninstall();
}
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp
index 813042211c..1f7bbf7cb6 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp
@@ -162,6 +162,6 @@ static int VBoxNetLwfInstall()
int __cdecl main(int argc, char **argv)
{
- RT_NOREF2(argc, argv);
+ RT_NOREF(argc, argv);
return VBoxNetLwfInstall();
}
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp
index 5437d98639..4bae3e05c6 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp
@@ -105,6 +105,6 @@ static int VBoxNetLwfUninstall()
int __cdecl main(int argc, char **argv)
{
- RT_NOREF2(argc, argv);
+ RT_NOREF(argc, argv);
return VBoxNetLwfUninstall();
}
diff --git a/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp b/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp
index 3145bcace8..85137fc896 100644
--- a/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp
@@ -294,7 +294,7 @@ static int usbfilterValidateStringPattern(const char *psz)
* This is only becomes important if we start doing
* sets ([0-9]) and such like.
*/
- RT_NOREF1(psz);
+ RT_NOREF(psz);
return VINF_SUCCESS;
}
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp
index fafcaaf958..2fad6e9a45 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp
@@ -72,7 +72,7 @@ static DECLCALLBACK(void) vboxUsbPanic(void *pvPanic)
int __cdecl main(int argc, char **argv)
{
- RT_NOREF2(argc, argv);
+ RT_NOREF(argc, argv);
printf("USB uninstallation\n");
VBoxDrvCfgLoggerSet(vboxUsbLog, NULL);
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp
index acdb0e17e7..acf53822cc 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp
@@ -119,7 +119,7 @@ VBOXDRVTOOL_DECL(NTSTATUS) VBoxDrvToolRegSetValueDword(IN HANDLE hKey, IN PWCHAR
static NTSTATUS vboxDrvToolIoCompletionSetEvent(IN PDEVICE_OBJECT pDevObj, IN PIRP pIrp, IN PVOID pvContext)
{
- RT_NOREF2(pDevObj, pIrp);
+ RT_NOREF(pDevObj, pIrp);
PKEVENT pEvent = (PKEVENT)pvContext;
KeSetEvent(pEvent, 0, FALSE);
return STATUS_MORE_PROCESSING_REQUIRED;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
index b22e5529b4..c2e20a47f9 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
@@ -117,7 +117,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRIVER_OBJECT pDriverObject,
static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject)
{
- RT_NOREF1(pDriverObject);
+ RT_NOREF(pDriverObject);
LogRel(("VBoxUsb::DriverUnload. Built Date (%s) Time (%s)\n", __DATE__, __TIME__));
VBoxDrvToolStrFree(&g_VBoxUsbGlobals.RegPath);
@@ -212,7 +212,7 @@ static NTSTATUS vboxUsbDispatchDeviceControl(IN PDEVICE_OBJECT pDeviceObject, IN
static NTSTATUS vboxUsbDispatchCleanup(IN PDEVICE_OBJECT pDeviceObject, IN PIRP pIrp)
{
- RT_NOREF1(pDeviceObject);
+ RT_NOREF(pDeviceObject);
return VBoxDrvToolIoComplete(pIrp, STATUS_SUCCESS, 0);
}
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp
index 4ef6055bf8..08cdb4396a 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp
@@ -67,7 +67,7 @@ static VOID vboxUsbPwrIoDeviceCompletion(IN PDEVICE_OBJECT pDeviceObject,
IN PVOID pvContext,
IN PIO_STATUS_BLOCK pIoStatus)
{
- RT_NOREF3(pDeviceObject, MinorFunction, PowerState);
+ RT_NOREF(pDeviceObject, MinorFunction, PowerState);
PVBOXUSB_PWRDEV_CTX pDevCtx = (PVBOXUSB_PWRDEV_CTX)pvContext;
PVBOXUSBDEV_EXT pDevExt = pDevCtx->pDevExt;
PIRP pIrp = pDevCtx->pIrp;
@@ -117,7 +117,7 @@ static NTSTATUS vboxUsbPwrIoRequestDev(IN PVBOXUSBDEV_EXT pDevExt, IN PIRP pIrp)
static NTSTATUS vboxUsbPwrIoPostSysCompletion(IN PDEVICE_OBJECT pDevObj, IN PIRP pIrp, IN PVOID pvContext)
{
- RT_NOREF1(pDevObj);
+ RT_NOREF(pDevObj);
PVBOXUSBDEV_EXT pDevExt = (PVBOXUSBDEV_EXT)pvContext;
NTSTATUS Status = pIrp->IoStatus.Status;
Assert(Status == STATUS_SUCCESS);
@@ -162,7 +162,7 @@ static NTSTATUS vboxUsbPwrQueryPowerSys(IN PVBOXUSBDEV_EXT pDevExt, IN PIRP pIrp
static NTSTATUS vboxUsbPwrIoPostDevCompletion(IN PDEVICE_OBJECT pDevObj, IN PIRP pIrp, IN PVOID pvContext)
{
- RT_NOREF1(pDevObj);
+ RT_NOREF(pDevObj);
PVBOXUSBDEV_EXT pDevExt = (PVBOXUSBDEV_EXT)pvContext;
if (pIrp->PendingReturned)
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp
index 0ba8141e52..44c2fb079d 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp
@@ -1028,7 +1028,7 @@ static NTSTATUS vboxUsbRtDispatchUsbAbortEndpoint(PVBOXUSBDEV_EXT pDevExt, PIRP
static NTSTATUS vboxUsbRtUrbSendCompletion(PDEVICE_OBJECT pDevObj, IRP *pIrp, void *pvContext)
{
- RT_NOREF1(pDevObj);
+ RT_NOREF(pDevObj);
if (!pvContext)
{
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp b/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp
index 81317c5c32..5eb8d332fd 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp
@@ -1189,7 +1189,7 @@ USBLIB_DECL(int) USBLibRunFilters(void)
static VOID CALLBACK usbLibTimerCallback(__in PVOID lpParameter, __in BOOLEAN TimerOrWaitFired)
{
- RT_NOREF2(lpParameter, TimerOrWaitFired);
+ RT_NOREF(lpParameter, TimerOrWaitFired);
SetEvent(g_VBoxUsbGlobal.hNotifyEvent);
}
@@ -1258,7 +1258,7 @@ static DWORD WINAPI usbLibMsgThreadProc(__in LPVOID lpParameter)
{
static LPCSTR s_szVBoxUsbWndClassName = "VBoxUsbLibClass";
const HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(NULL);
- RT_NOREF1(lpParameter);
+ RT_NOREF(lpParameter);
Assert(g_VBoxUsbGlobal.hWnd == NULL);
g_VBoxUsbGlobal.hWnd = NULL;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp
index 7a01a3818b..69f8377a04 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp
@@ -1203,7 +1203,7 @@ static void vboxUsbDevToUserInfo(PVBOXUSBFLTCTX pContext, PVBOXUSBFLT_DEVICE pDe
}
pDevInfo->fHighSpeed = pDevice->fHighSpeed;
#else
- RT_NOREF3(pContext, pDevice, pDevInfo);
+ RT_NOREF(pContext, pDevice, pDevInfo);
#endif
}
@@ -1328,7 +1328,7 @@ NTSTATUS VBoxUsbFltPdoAdd(PDEVICE_OBJECT pPdo, BOOLEAN *pbFiltered)
NTSTATUS VBoxUsbFltPdoAddCompleted(PDEVICE_OBJECT pPdo)
{
- RT_NOREF1(pPdo);
+ RT_NOREF(pPdo);
VBOXUSBFLT_LOCK_ACQUIRE();
vboxUsbFltSignalChangeLocked();
VBOXUSBFLT_LOCK_RELEASE();
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp
index 2f0bd54da1..5685e2bf53 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp
@@ -154,7 +154,7 @@ NTSTATUS VBoxUsbHookRequestPassDownHookSkip(PVBOXUSBHOOK_ENTRY pHook, PDEVICE_OB
NTSTATUS VBoxUsbHookRequestMoreProcessingRequired(PVBOXUSBHOOK_ENTRY pHook, PDEVICE_OBJECT pDevObj, PIRP pIrp,
PVBOXUSBHOOK_REQUEST pRequest)
{
- RT_NOREF3(pHook, pDevObj, pIrp);
+ RT_NOREF(pHook, pDevObj, pIrp);
Assert(!pRequest->bCompletionStopped);
pRequest->bCompletionStopped = TRUE;
return STATUS_MORE_PROCESSING_REQUIRED;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
index 1edc02f9bb..508395ea5f 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
@@ -184,7 +184,7 @@ static const char* vboxUsbDbgStrPnPMn(UCHAR uMn)
void vboxUsbDbgPrintUnicodeString(PUNICODE_STRING pUnicodeString)
{
- RT_NOREF1(pUnicodeString);
+ RT_NOREF(pUnicodeString);
Log(("%.*ls", pUnicodeString->Length / 2, pUnicodeString->Buffer));
}
@@ -635,7 +635,7 @@ VOID vboxUsbMonHubDevWalk(PFNVBOXUSBMONDEVWALKER pfnWalker, PVOID pvWalker, ULON
}
}
#else /* VBOX_USB3PORT */
- RT_NOREF1(fFlags);
+ RT_NOREF(fFlags);
PWSTR szwHubList;
Status = IoGetDeviceInterfaces(&GUID_DEVINTERFACE_USB_HUB, NULL, 0, &szwHubList);
if (Status != STATUS_SUCCESS)
@@ -1547,7 +1547,7 @@ static NTSTATUS _stdcall VBoxUsbMonClose(PDEVICE_OBJECT pDevObj, PIRP pIrp)
static NTSTATUS _stdcall VBoxUsbMonCreate(PDEVICE_OBJECT pDevObj, PIRP pIrp)
{
- RT_NOREF1(pDevObj);
+ RT_NOREF(pDevObj);
PIO_STACK_LOCATION pStack = IoGetCurrentIrpStackLocation(pIrp);
PFILE_OBJECT pFileObj = pStack->FileObject;
NTSTATUS Status;
@@ -1896,7 +1896,7 @@ static NTSTATUS _stdcall VBoxUsbMonInternalDeviceControl(PDEVICE_OBJECT pDevObj,
*/
static void _stdcall VBoxUsbMonUnload(PDRIVER_OBJECT pDrvObj)
{
- RT_NOREF1(pDrvObj);
+ RT_NOREF(pDrvObj);
LOG(("VBoxUSBMonUnload pDrvObj (0x%p)", pDrvObj));
IoReleaseRemoveLockAndWait(&g_VBoxUsbMonGlobals.RmLock, &g_VBoxUsbMonGlobals);
@@ -1931,7 +1931,7 @@ RT_C_DECLS_END
*/
NTSTATUS _stdcall DriverEntry(PDRIVER_OBJECT pDrvObj, PUNICODE_STRING pRegPath)
{
- RT_NOREF1(pRegPath);
+ RT_NOREF(pRegPath);
#ifdef VBOX_USB_WITH_VERBOSE_LOGGING
RTLogGroupSettings(0, "+default.e.l.f.l2.l3");
RTLogDestinations(0, "debugger");
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp b/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp
index d27097aa22..fba6d18a1d 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp
@@ -316,7 +316,7 @@ int usbMonitorTerm()
int __cdecl main(int argc, char **argv)
{
int rc;
- RT_NOREF2(argc, argv);
+ RT_NOREF(argc, argv);
printf("USB test\n");
diff --git a/src/VBox/HostServices/GuestControl/service.cpp b/src/VBox/HostServices/GuestControl/service.cpp
index cae21e7293..aa8c5f5cdd 100644
--- a/src/VBox/HostServices/GuestControl/service.cpp
+++ b/src/VBox/HostServices/GuestControl/service.cpp
@@ -1040,7 +1040,7 @@ private:
*/
int Service::clientConnect(uint32_t u32ClientID, void *pvClient)
{
- RT_NOREF1(pvClient);
+ RT_NOREF(pvClient);
LogFlowFunc(("[Client %RU32] Connected\n", u32ClientID));
#ifdef VBOX_STRICT
ClientStateMapIterConst it = mClientStateMap.find(u32ClientID);
@@ -1068,7 +1068,7 @@ int Service::clientConnect(uint32_t u32ClientID, void *pvClient)
*/
int Service::clientDisconnect(uint32_t u32ClientID, void *pvClient)
{
- RT_NOREF1(pvClient);
+ RT_NOREF(pvClient);
LogFlowFunc(("[Client %RU32] Disconnected (%zu clients total)\n",
u32ClientID, mClientStateMap.size()));
@@ -1251,7 +1251,7 @@ int Service::clientSetMsgFilterUnset(uint32_t u32ClientID, VBOXHGCMCALLHANDLE ca
int Service::clientSkipMsg(uint32_t u32ClientID, VBOXHGCMCALLHANDLE callHandle,
uint32_t cParms, VBOXHGCMSVCPARM paParms[])
{
- RT_NOREF2(callHandle, paParms);
+ RT_NOREF(callHandle, paParms);
/*
* Lookup client in our list so that we can assign the context ID of
@@ -1575,7 +1575,7 @@ int Service::hostCall(uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paPar
*/
int Service::sessionClose(uint32_t u32ClientID, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
{
- RT_NOREF2(u32ClientID, callHandle);
+ RT_NOREF(u32ClientID, callHandle);
if (cParms < 2)
return VERR_INVALID_PARAMETER;
diff --git a/src/VBox/HostServices/GuestProperties/service.cpp b/src/VBox/HostServices/GuestProperties/service.cpp
index 94240bf104..7e82d1e50e 100644
--- a/src/VBox/HostServices/GuestProperties/service.cpp
+++ b/src/VBox/HostServices/GuestProperties/service.cpp
@@ -473,7 +473,7 @@ int Service::validateName(const char *pszName, uint32_t cbName)
*/
int Service::validateValue(const char *pszValue, uint32_t cbValue)
{
- LogFlowFunc(("cbValue=%d\n", cbValue)); RT_NOREF1(pszValue);
+ LogFlowFunc(("cbValue=%d\n", cbValue)); RT_NOREF(pszValue);
int rc = VINF_SUCCESS;
if (RT_SUCCESS(rc) && cbValue == 0)
diff --git a/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp b/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp
index cc4ff71999..c182a7899a 100644
--- a/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp
+++ b/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp
@@ -770,7 +770,7 @@ static void setupAsyncNotification(VBOXHGCMSVCFNTABLE *pTable)
*/
static void testAsyncNotification(VBOXHGCMSVCFNTABLE *pTable)
{
- RT_NOREF1(pTable);
+ RT_NOREF(pTable);
uint64_t u64Timestamp;
uint32_t u32Size;
if ( g_AsyncNotification.callHandle.rc != VINF_SUCCESS
diff --git a/src/VBox/HostServices/HostChannel/HostChannel.cpp b/src/VBox/HostServices/HostChannel/HostChannel.cpp
index 0b4439047a..0d2ce4be9d 100644
--- a/src/VBox/HostServices/HostChannel/HostChannel.cpp
+++ b/src/VBox/HostServices/HostChannel/HostChannel.cpp
@@ -228,7 +228,7 @@ static int vhcHandleCreate(VBOXHOSTCHCLIENT *pClient, uint32_t *pu32Handle)
static void vhcInstanceDestroy(VBOXHOSTCHINSTANCE *pInstance)
{
- RT_NOREF1(pInstance);
+ RT_NOREF(pInstance);
HOSTCHLOG(("HostChannel: destroy %p\n", pInstance));
}
@@ -968,7 +968,7 @@ int vboxHostChannelRegister(const char *pszName,
const VBOXHOSTCHANNELINTERFACE *pInterface,
uint32_t cbInterface)
{
- RT_NOREF1(cbInterface);
+ RT_NOREF(cbInterface);
int rc = VINF_SUCCESS;
VBOXHOSTCHCTX *pCtx = &g_ctx;
diff --git a/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp b/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp
index 252d74d72f..ac4bb6b1c0 100644
--- a/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp
+++ b/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp
@@ -820,7 +820,7 @@ int vboxClipboardSync (VBOXCLIPBOARDCLIENTDATA *pClient)
void vboxClipboardDisconnect (VBOXCLIPBOARDCLIENTDATA *pClient)
{
- RT_NOREF1(pClient);
+ RT_NOREF(pClient);
Log(("vboxClipboardDisconnect\n"));
g_ctx.pClient = NULL;
diff --git a/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp b/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp
index 68853a049d..012976d2f0 100644
--- a/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp
+++ b/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp
@@ -453,7 +453,7 @@ struct _CLIPBACKEND
void vboxSvcClipboardReportMsg (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Msg, uint32_t u32Formats)
{
- RT_NOREF1(u32Formats);
+ RT_NOREF(u32Formats);
CLIPBACKEND *pBackend = pClient->pCtx->pBackend;
if ( (u32Msg == VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA)
&& !pBackend->writeData.timeout)
@@ -473,7 +473,7 @@ void vboxSvcClipboardCompleteReadData(VBOXCLIPBOARDCLIENTDATA *pClient, int rc,
CLIPBACKEND *ClipConstructX11(VBOXCLIPBOARDCONTEXT *pFrontend, bool)
{
- RT_NOREF1(pFrontend);
+ RT_NOREF(pFrontend);
return (CLIPBACKEND *)RTMemAllocZ(sizeof(CLIPBACKEND));
}
@@ -484,13 +484,13 @@ void ClipDestructX11(CLIPBACKEND *pBackend)
int ClipStartX11(CLIPBACKEND *pBackend, bool)
{
- RT_NOREF1(pBackend);
+ RT_NOREF(pBackend);
return VINF_SUCCESS;
}
int ClipStopX11(CLIPBACKEND *pBackend)
{
- RT_NOREF1(pBackend);
+ RT_NOREF(pBackend);
return VINF_SUCCESS;
}
diff --git a/src/VBox/HostServices/SharedFolders/mappings.cpp b/src/VBox/HostServices/SharedFolders/mappings.cpp
index ec378f84f5..c25240df8e 100644
--- a/src/VBox/HostServices/SharedFolders/mappings.cpp
+++ b/src/VBox/HostServices/SharedFolders/mappings.cpp
@@ -486,7 +486,7 @@ int vbsfMappingsQueryName(PSHFLCLIENTDATA pClient, SHFLROOT root, SHFLSTRING *pS
*/
int vbsfMappingsQueryWritable(PSHFLCLIENTDATA pClient, SHFLROOT root, bool *fWritable)
{
- RT_NOREF1(pClient);
+ RT_NOREF(pClient);
int rc = VINF_SUCCESS;
LogFlow(("vbsfMappingsQueryWritable: pClient = %p, root = %d\n", pClient, root));
@@ -507,7 +507,7 @@ int vbsfMappingsQueryWritable(PSHFLCLIENTDATA pClient, SHFLROOT root, bool *fWri
int vbsfMappingsQueryAutoMount(PSHFLCLIENTDATA pClient, SHFLROOT root, bool *fAutoMount)
{
- RT_NOREF1(pClient);
+ RT_NOREF(pClient);
int rc = VINF_SUCCESS;
LogFlow(("vbsfMappingsQueryAutoMount: pClient = %p, root = %d\n", pClient, root));
@@ -527,7 +527,7 @@ int vbsfMappingsQueryAutoMount(PSHFLCLIENTDATA pClient, SHFLROOT root, bool *fAu
int vbsfMappingsQuerySymlinksCreate(PSHFLCLIENTDATA pClient, SHFLROOT root, bool *fSymlinksCreate)
{
- RT_NOREF1(pClient);
+ RT_NOREF(pClient);
int rc = VINF_SUCCESS;
LogFlow(("vbsfMappingsQueryAutoMount: pClient = %p, root = %d\n", pClient, root));
@@ -639,7 +639,7 @@ void testUnmapFolder(RTTEST hTest)
#endif
int vbsfUnmapFolder(PSHFLCLIENTDATA pClient, SHFLROOT root)
{
- RT_NOREF1(pClient);
+ RT_NOREF(pClient);
int rc = VINF_SUCCESS;
MAPPING *pFolderMapping = vbsfMappingGetByRoot(root);
diff --git a/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp b/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp
index c17cf908c5..ed7521e4aa 100644
--- a/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp
+++ b/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp
@@ -133,7 +133,7 @@ static char testRTDirCreatePath[256];
extern int testRTDirCreate(const char *pszPath, RTFMODE fMode, uint32_t fCreate)
{
- RT_NOREF2(fMode, fCreate);
+ RT_NOREF(fMode, fCreate);
/* RTPrintf("%s: pszPath=%s, fMode=0x%llx\n", __PRETTY_FUNCTION__, pszPath,
LLUIFY(fMode)); */
if (g_fFailIfNotLowercase && !RTStrIsLowerCased(strpbrk(pszPath, "/\\")))
@@ -204,7 +204,7 @@ static RTTIMESPEC testRTDirQueryInfoATime;
extern int testRTDirQueryInfo(RTDIR hDir, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs)
{
- RT_NOREF1(enmAdditionalAttribs);
+ RT_NOREF(enmAdditionalAttribs);
/* RTPrintf("%s: hDir=%p, enmAdditionalAttribs=0x%llx\n", __PRETTY_FUNCTION__,
hDir, LLUIFY(enmAdditionalAttribs)); */
g_testRTDirQueryInfo_hDir = hDir;
@@ -227,7 +227,7 @@ static RTDIR g_testRTDirReadEx_hDir;
extern int testRTDirReadEx(RTDIR hDir, PRTDIRENTRYEX pDirEntry, size_t *pcbDirEntry,
RTFSOBJATTRADD enmAdditionalAttribs, uint32_t fFlags)
{
- RT_NOREF4(pDirEntry, pcbDirEntry, enmAdditionalAttribs, fFlags);
+ RT_NOREF(pDirEntry, pcbDirEntry, enmAdditionalAttribs, fFlags);
/* RTPrintf("%s: hDir=%p, pcbDirEntry=%d, enmAdditionalAttribs=%llu, fFlags=0x%llx\n",
__PRETTY_FUNCTION__, hDir, pcbDirEntry ? (int) *pcbDirEntry : -1,
LLUIFY(enmAdditionalAttribs), LLUIFY(fFlags)); */
@@ -275,7 +275,7 @@ static RTTIMESPEC testRTDirSetTimesATime;
extern int testRTDirSetTimes(RTDIR hDir, PCRTTIMESPEC pAccessTime, PCRTTIMESPEC pModificationTime,
PCRTTIMESPEC pChangeTime, PCRTTIMESPEC pBirthTime)
{
- RT_NOREF4(hDir, pModificationTime, pChangeTime, pBirthTime);
+ RT_NOREF(hDir, pModificationTime, pChangeTime, pBirthTime);
/* RTPrintf("%s: hDir=%p, *pAccessTime=%lli, *pModificationTime=%lli, *pChangeTime=%lli, *pBirthTime=%lli\n",
__PRETTY_FUNCTION__, hDir,
pAccessTime ? (long long)RTTimeSpecGetNano(pAccessTime) : -1,
@@ -356,7 +356,7 @@ static uint32_t testRTFileQueryInfoFMode;
extern int testRTFileQueryInfo(RTFILE hFile, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs)
{
- RT_NOREF1(enmAdditionalAttribs);
+ RT_NOREF(enmAdditionalAttribs);
/* RTPrintf("%s, hFile=%p, enmAdditionalAttribs=0x%llx\n",
__PRETTY_FUNCTION__, hFile, LLUIFY(enmAdditionalAttribs)); */
g_testRTFileQueryInfoFile = hFile;
@@ -372,7 +372,7 @@ static const char *testRTFileReadData;
extern int testRTFileRead(RTFILE File, void *pvBuf, size_t cbToRead, size_t *pcbRead)
{
- RT_NOREF1(File);
+ RT_NOREF(File);
/* RTPrintf("%s : File=%p, cbToRead=%llu\n", __PRETTY_FUNCTION__, File,
LLUIFY(cbToRead)); */
bufferFromPath(pvBuf, cbToRead, testRTFileReadData);
@@ -384,7 +384,7 @@ extern int testRTFileRead(RTFILE File, void *pvBuf, size_t cbToRead, size_t *pc
extern int testRTFileSeek(RTFILE hFile, int64_t offSeek, unsigned uMethod, uint64_t *poffActual)
{
- RT_NOREF3(hFile, offSeek, uMethod);
+ RT_NOREF(hFile, offSeek, uMethod);
/* RTPrintf("%s : hFile=%p, offSeek=%llu, uMethod=%u\n", __PRETTY_FUNCTION__,
hFile, LLUIFY(offSeek), uMethod); */
if (poffActual)
@@ -396,7 +396,7 @@ static uint64_t testRTFileSetFMode;
extern int testRTFileSetMode(RTFILE File, RTFMODE fMode)
{
- RT_NOREF1(File);
+ RT_NOREF(File);
/* RTPrintf("%s: fMode=%llu\n", __PRETTY_FUNCTION__, LLUIFY(fMode)); */
testRTFileSetFMode = fMode;
return VINF_SUCCESS;
@@ -419,7 +419,7 @@ static RTTIMESPEC testRTFileSetTimesATime;
extern int testRTFileSetTimes(RTFILE File, PCRTTIMESPEC pAccessTime, PCRTTIMESPEC pModificationTime,
PCRTTIMESPEC pChangeTime, PCRTTIMESPEC pBirthTime)
{
- RT_NOREF4(File, pModificationTime, pChangeTime, pBirthTime);
+ RT_NOREF(File, pModificationTime, pChangeTime, pBirthTime);
/* RTPrintf("%s: pFile=%p, *pAccessTime=%lli, *pModificationTime=%lli, *pChangeTime=%lli, *pBirthTime=%lli\n",
__PRETTY_FUNCTION__,
pAccessTime ? (long long)RTTimeSpecGetNano(pAccessTime) : -1,
@@ -452,7 +452,7 @@ static char testRTFileWriteData[256];
extern int testRTFileWrite(RTFILE File, const void *pvBuf, size_t cbToWrite, size_t *pcbWritten)
{
- RT_NOREF2(File, cbToWrite);
+ RT_NOREF(File, cbToWrite);
/* RTPrintf("%s: File=%p, pvBuf=%.*s, cbToWrite=%llu\n", __PRETTY_FUNCTION__,
File, cbToWrite, (const char *)pvBuf, LLUIFY(cbToWrite)); */
ARRAY_FROM_PATH(testRTFileWriteData, (const char *)pvBuf);
@@ -463,7 +463,7 @@ extern int testRTFileWrite(RTFILE File, const void *pvBuf, size_t cbToWrite, si
extern int testRTFsQueryProperties(const char *pszFsPath, PRTFSPROPERTIES pProperties)
{
- RT_NOREF1(pszFsPath);
+ RT_NOREF(pszFsPath);
/* RTPrintf("%s, pszFsPath=%s\n", __PRETTY_FUNCTION__, pszFsPath);
RT_ZERO(*pProperties); */
pProperties->cbMaxComponent = 256;
@@ -473,20 +473,20 @@ extern int testRTFsQueryProperties(const char *pszFsPath, PRTFSPROPERTIES pPrope
extern int testRTFsQuerySerial(const char *pszFsPath, uint32_t *pu32Serial)
{
- RT_NOREF2(pszFsPath, pu32Serial);
+ RT_NOREF(pszFsPath, pu32Serial);
RTPrintf("%s\n", __PRETTY_FUNCTION__);
return 0;
}
extern int testRTFsQuerySizes(const char *pszFsPath, PRTFOFF pcbTotal, RTFOFF *pcbFree, uint32_t *pcbBlock, uint32_t *pcbSector)
{
- RT_NOREF5(pszFsPath, pcbTotal, pcbFree, pcbBlock, pcbSector);
+ RT_NOREF(pszFsPath, pcbTotal, pcbFree, pcbBlock, pcbSector);
RTPrintf("%s\n", __PRETTY_FUNCTION__);
return 0;
}
extern int testRTPathQueryInfoEx(const char *pszPath, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs, uint32_t fFlags)
{
- RT_NOREF2(enmAdditionalAttribs, fFlags);
+ RT_NOREF(enmAdditionalAttribs, fFlags);
/* RTPrintf("%s: pszPath=%s, enmAdditionalAttribs=0x%x, fFlags=0x%x\n",
__PRETTY_FUNCTION__, pszPath, (unsigned) enmAdditionalAttribs,
(unsigned) fFlags); */
@@ -498,7 +498,7 @@ extern int testRTPathQueryInfoEx(const char *pszPath, PRTFSOBJINFO pObjInfo, RTF
extern int testRTSymlinkDelete(const char *pszSymlink, uint32_t fDelete)
{
- RT_NOREF2(pszSymlink, fDelete);
+ RT_NOREF(pszSymlink, fDelete);
if (g_fFailIfNotLowercase && !RTStrIsLowerCased(strpbrk(pszSymlink, "/\\")))
return VERR_FILE_NOT_FOUND;
RTPrintf("%s\n", __PRETTY_FUNCTION__);
@@ -509,7 +509,7 @@ extern int testRTSymlinkRead(const char *pszSymlink, char *pszTarget, size_t cbT
{
if (g_fFailIfNotLowercase && !RTStrIsLowerCased(strpbrk(pszSymlink, "/\\")))
return VERR_FILE_NOT_FOUND;
- RT_NOREF4(pszSymlink, pszTarget, cbTarget, fRead);
+ RT_NOREF(pszSymlink, pszTarget, cbTarget, fRead);
RTPrintf("%s\n", __PRETTY_FUNCTION__);
return 0;
}
@@ -520,71 +520,71 @@ extern int testRTSymlinkRead(const char *pszSymlink, char *pszTarget, size_t cbT
*********************************************************************************************************************************/
/* Sub-tests for testMappingsQuery(). */
-void testMappingsQuerySimple(RTTEST hTest) { RT_NOREF1(hTest); }
-void testMappingsQueryTooFewBuffers(RTTEST hTest) { RT_NOREF1(hTest); }
-void testMappingsQueryAutoMount(RTTEST hTest) { RT_NOREF1(hTest); }
-void testMappingsQueryArrayWrongSize(RTTEST hTest) { RT_NOREF1(hTest); }
+void testMappingsQuerySimple(RTTEST hTest) { RT_NOREF(hTest); }
+void testMappingsQueryTooFewBuffers(RTTEST hTest) { RT_NOREF(hTest); }
+void testMappingsQueryAutoMount(RTTEST hTest) { RT_NOREF(hTest); }
+void testMappingsQueryArrayWrongSize(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testMappingsQueryName(). */
-void testMappingsQueryNameValid(RTTEST hTest) { RT_NOREF1(hTest); }
-void testMappingsQueryNameInvalid(RTTEST hTest) { RT_NOREF1(hTest); }
-void testMappingsQueryNameBadBuffer(RTTEST hTest) { RT_NOREF1(hTest); }
+void testMappingsQueryNameValid(RTTEST hTest) { RT_NOREF(hTest); }
+void testMappingsQueryNameInvalid(RTTEST hTest) { RT_NOREF(hTest); }
+void testMappingsQueryNameBadBuffer(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testMapFolder(). */
-void testMapFolderValid(RTTEST hTest) { RT_NOREF1(hTest); }
-void testMapFolderInvalid(RTTEST hTest) { RT_NOREF1(hTest); }
-void testMapFolderTwice(RTTEST hTest) { RT_NOREF1(hTest); }
-void testMapFolderDelimiter(RTTEST hTest) { RT_NOREF1(hTest); }
-void testMapFolderCaseSensitive(RTTEST hTest) { RT_NOREF1(hTest); }
-void testMapFolderCaseInsensitive(RTTEST hTest) { RT_NOREF1(hTest); }
-void testMapFolderBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testMapFolderValid(RTTEST hTest) { RT_NOREF(hTest); }
+void testMapFolderInvalid(RTTEST hTest) { RT_NOREF(hTest); }
+void testMapFolderTwice(RTTEST hTest) { RT_NOREF(hTest); }
+void testMapFolderDelimiter(RTTEST hTest) { RT_NOREF(hTest); }
+void testMapFolderCaseSensitive(RTTEST hTest) { RT_NOREF(hTest); }
+void testMapFolderCaseInsensitive(RTTEST hTest) { RT_NOREF(hTest); }
+void testMapFolderBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testUnmapFolder(). */
-void testUnmapFolderValid(RTTEST hTest) { RT_NOREF1(hTest); }
-void testUnmapFolderInvalid(RTTEST hTest) { RT_NOREF1(hTest); }
-void testUnmapFolderBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testUnmapFolderValid(RTTEST hTest) { RT_NOREF(hTest); }
+void testUnmapFolderInvalid(RTTEST hTest) { RT_NOREF(hTest); }
+void testUnmapFolderBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testCreate(). */
-void testCreateBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testCreateBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testClose(). */
-void testCloseBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testCloseBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testRead(). */
-void testReadBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testReadBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testWrite(). */
-void testWriteBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testWriteBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testLock(). */
-void testLockBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testLockBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testFlush(). */
-void testFlushBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testFlushBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testDirList(). */
-void testDirListBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testDirListBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testReadLink(). */
-void testReadLinkBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testReadLinkBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testFSInfo(). */
-void testFSInfoBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testFSInfoBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testRemove(). */
-void testRemoveBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testRemoveBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testRename(). */
-void testRenameBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testRenameBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testSymlink(). */
-void testSymlinkBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testSymlinkBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testMappingsAdd(). */
-void testMappingsAddBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testMappingsAddBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
/* Sub-tests for testMappingsRemove(). */
-void testMappingsRemoveBadParameters(RTTEST hTest) { RT_NOREF1(hTest); }
+void testMappingsRemoveBadParameters(RTTEST hTest) { RT_NOREF(hTest); }
union TESTSHFLSTRING
{
@@ -651,7 +651,7 @@ static SHFLROOT initWithWritableMapping(RTTEST hTest,
static void unmapAndRemoveMapping(RTTEST hTest, VBOXHGCMSVCFNTABLE *psvcTable,
SHFLROOT root, const char *pcszFolderName)
{
- RT_NOREF1(hTest);
+ RT_NOREF(hTest);
VBOXHGCMSVCPARM aParms[RT_MAX(SHFL_CPARMS_UNMAP_FOLDER,
SHFL_CPARMS_REMOVE_MAPPING)];
VBOXHGCMCALLHANDLE_TYPEDEF callHandle = { VINF_SUCCESS };
@@ -1288,7 +1288,7 @@ static void testAPI(RTTEST hTest)
int main(int argc, char **argv)
{
- RT_NOREF1(argc);
+ RT_NOREF(argc);
RTEXITCODE rcExit = RTTestInitAndCreate(RTPathFilename(argv[0]), &g_hTest);
if (rcExit != RTEXITCODE_SUCCESS)
return rcExit;
diff --git a/src/VBox/HostServices/SharedFolders/testcase/tstShflCase.cpp b/src/VBox/HostServices/SharedFolders/testcase/tstShflCase.cpp
index cb6187d9ac..487b7018fc 100644
--- a/src/VBox/HostServices/SharedFolders/testcase/tstShflCase.cpp
+++ b/src/VBox/HostServices/SharedFolders/testcase/tstShflCase.cpp
@@ -107,7 +107,7 @@ static const char *g_apszSUBDIREntries[] =
int rtDirOpenFiltered(RTDIR *phDir, const char *pszPath, RTDIRFILTER enmFilter, uint32_t fFlags)
{
- RT_NOREF2(enmFilter, fFlags);
+ RT_NOREF(enmFilter, fFlags);
if (!strcmp(pszPath, "c:\\*"))
iDirList = 1;
else if (!strcmp(pszPath, "c:\\test dir\\*"))
@@ -123,14 +123,14 @@ int rtDirOpenFiltered(RTDIR *phDir, const char *pszPath, RTDIRFILTER enmFilter,
int rtDirClose(RTDIR hDir)
{
- RT_NOREF1(hDir);
+ RT_NOREF(hDir);
iDirFile = 0;
return VINF_SUCCESS;
}
int rtDirReadEx(RTDIR hDir, PRTDIRENTRYEX pDirEntry, size_t *pcbDirEntry, RTFSOBJATTRADD enmAdditionalAttribs, uint32_t fFlags)
{
- RT_NOREF4(hDir, pcbDirEntry, enmAdditionalAttribs, fFlags);
+ RT_NOREF(hDir, pcbDirEntry, enmAdditionalAttribs, fFlags);
switch (iDirList)
{
case 1:
@@ -157,7 +157,7 @@ int rtDirReadEx(RTDIR hDir, PRTDIRENTRYEX pDirEntry, size_t *pcbDirEntry, RTFSOB
int rtPathQueryInfo(const char *pszPath, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs)
{
- RT_NOREF2(pObjInfo, enmAdditionalAttribs);
+ RT_NOREF(pObjInfo, enmAdditionalAttribs);
int cMax;
/* first try g_apszDirs */
diff --git a/src/VBox/HostServices/SharedFolders/vbsf.cpp b/src/VBox/HostServices/SharedFolders/vbsf.cpp
index d276ca98b1..950ace5bc4 100644
--- a/src/VBox/HostServices/SharedFolders/vbsf.cpp
+++ b/src/VBox/HostServices/SharedFolders/vbsf.cpp
@@ -1408,7 +1408,7 @@ int vbsfReadLink(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLSTRING *pPath, uint
int vbsfQueryFileInfo(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLHANDLE Handle, uint32_t flags,
uint32_t *pcbBuffer, uint8_t *pBuffer)
{
- RT_NOREF1(flags);
+ RT_NOREF(flags);
uint32_t type = vbsfQueryHandleType(pClient, Handle);
int rc = VINF_SUCCESS;
SHFLFSOBJINFO *pObjInfo = (SHFLFSOBJINFO *)pBuffer;
@@ -1457,7 +1457,7 @@ int vbsfQueryFileInfo(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLHANDLE Handle,
static int vbsfSetFileInfo(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLHANDLE Handle, uint32_t flags,
uint32_t *pcbBuffer, uint8_t *pBuffer)
{
- RT_NOREF1(flags);
+ RT_NOREF(flags);
uint32_t type = vbsfQueryHandleType(pClient, Handle);
int rc = VINF_SUCCESS;
SHFLFSOBJINFO *pSFDEntry;
@@ -1562,7 +1562,7 @@ static int vbsfSetFileInfo(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLHANDLE Ha
static int vbsfSetEndOfFile(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLHANDLE Handle, uint32_t flags,
uint32_t *pcbBuffer, uint8_t *pBuffer)
{
- RT_NOREF1(flags);
+ RT_NOREF(flags);
SHFLFILEHANDLE *pHandle = vbsfQueryFileHandle(pClient, Handle);
SHFLFSOBJINFO *pSFDEntry;
@@ -1613,7 +1613,7 @@ static int vbsfSetEndOfFile(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLHANDLE H
int vbsfQueryVolumeInfo(SHFLCLIENTDATA *pClient, SHFLROOT root, uint32_t flags, uint32_t *pcbBuffer, uint8_t *pBuffer)
{
- RT_NOREF2(root, flags);
+ RT_NOREF(root, flags);
int rc = VINF_SUCCESS;
SHFLVOLINFO *pSFDEntry;
char *pszFullPath = NULL;
@@ -1788,7 +1788,7 @@ int vbsfLock(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLHANDLE Handle, uint64_t
#else
Log(("vbsfLock: Pretend success handle=%x\n", Handle));
rc = VINF_SUCCESS;
- RT_NOREF2(offset, length);
+ RT_NOREF(offset, length);
#endif
return rc;
}
@@ -1819,7 +1819,7 @@ int vbsfUnlock(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLHANDLE Handle, uint64
#else
Log(("vbsfUnlock: Pretend success handle=%x\n", Handle));
rc = VINF_SUCCESS;
- RT_NOREF2(offset, length);
+ RT_NOREF(offset, length);
#endif
return rc;
diff --git a/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp b/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp
index aed90da0fd..76d4155676 100644
--- a/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp
+++ b/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp
@@ -67,7 +67,7 @@
BOOL APIENTRY DllMain(HANDLE hModule, DWORD uReason, LPVOID lpReserved)
{
- RT_NOREF3(hModule, uReason, lpReserved);
+ RT_NOREF(hModule, uReason, lpReserved);
return TRUE;
}
@@ -111,7 +111,7 @@ UINT __stdcall IsSerialCheckNeeded(MSIHANDLE hModule)
#ifndef VBOX_OSE
/*BOOL bRet =*/ serialCheckNeeded(hModule);
#else
- RT_NOREF1(hModule);
+ RT_NOREF(hModule);
#endif
return ERROR_SUCCESS;
}
@@ -121,7 +121,7 @@ UINT __stdcall CheckSerial(MSIHANDLE hModule)
#ifndef VBOX_OSE
/*BOOL bRet =*/ serialIsValid(hModule);
#else
- RT_NOREF1(hModule);
+ RT_NOREF(hModule);
#endif
return ERROR_SUCCESS;
}
@@ -509,7 +509,7 @@ static UINT _uninstallNetLwf(MSIHANDLE hModule);
static VOID vboxDrvLoggerCallback(VBOXDRVCFG_LOG_SEVERITY enmSeverity, char *pszMsg, void *pvContext)
{
- RT_NOREF1(pvContext);
+ RT_NOREF(pvContext);
switch (enmSeverity)
{
case VBOXDRVCFG_LOG_SEVERITY_FLOW:
diff --git a/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp b/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp
index 44fbf3484e..d590e2143c 100644
--- a/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp
+++ b/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp
@@ -295,7 +295,7 @@ static RTEXITCODE SetExtPackPermissions(const char *pszDir)
return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to set directory permissions: %Rrc ('%s')", rc, pszDir);
#else
/** @todo TrustedInstaller? */
- RT_NOREF1(pszDir);
+ RT_NOREF(pszDir);
#endif
return RTEXITCODE_SUCCESS;
@@ -339,7 +339,7 @@ static RTEXITCODE ValidateMemberOfExtPack(const char *pszName, RTVFSOBJTYPE enmT
*/
static RTEXITCODE ValidateUnpackedExtPack(const char *pszDir, const char *pszTarball, const char *pszExtPackName)
{
- RT_NOREF2(pszTarball, pszExtPackName);
+ RT_NOREF(pszTarball, pszExtPackName);
RTMsgInfo("Validating unpacked extension pack...");
RTERRINFOSTATIC ErrInfo;
@@ -491,7 +491,7 @@ static RTEXITCODE UnpackExtPackFile(const char *pszName, const char *pszDstFilen
static RTEXITCODE UnpackExtPack(RTFILE hTarballFile, const char *pszDirDst, RTMANIFEST hValidManifest,
const char *pszTarball)
{
- RT_NOREF1(pszTarball);
+ RT_NOREF(pszTarball);
RTMsgInfo("Unpacking extension pack into '%s'...", pszDirDst);
/*
@@ -655,7 +655,7 @@ static RTEXITCODE DoInstall2(const char *pszBaseDir, const char *pszCertDir, con
const char *pszTarballDigest, RTFILE hTarballFile, RTFILE hTarballFileOpt,
const char *pszName, const char *pszMangledName, bool fReplace)
{
- RT_NOREF1(pszCertDir);
+ RT_NOREF(pszCertDir);
/*
* Do some basic validation of the tarball file.
diff --git a/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp
index a6f604fe31..ec8468da9d 100644
--- a/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp
@@ -357,7 +357,7 @@ static int rtR0MemObjNativeAllocContEx(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bo
size_t uAlignment)
{
AssertMsgReturn(cb <= _1G, ("%#x\n", cb), VERR_OUT_OF_RANGE); /* for safe size_t -> ULONG */
- RT_NOREF1(fExecutable);
+ RT_NOREF(fExecutable);
/*
* Allocate the memory and create an MDL for it.
diff --git a/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp
index d534ce27bd..06466e76d2 100644
--- a/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp
@@ -1306,7 +1306,7 @@ static int rtMpCallUsingBroadcastIpi(PFNRTMPWORKER pfnWorker, void *pvUser1, voi
static VOID rtmpNtDPCWrapper(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2)
{
PRTMPARGS pArgs = (PRTMPARGS)DeferredContext;
- RT_NOREF3(Dpc, SystemArgument1, SystemArgument2);
+ RT_NOREF(Dpc, SystemArgument1, SystemArgument2);
ASMAtomicIncU32(&pArgs->cHits);
pArgs->pfnWorker(RTMpCpuId(), pArgs->pvUser1, pArgs->pvUser2);
@@ -1631,7 +1631,7 @@ static VOID rtMpNtOnSpecificDpcWrapper(IN PKDPC Dpc, IN PVOID DeferredContext,
IN PVOID SystemArgument1, IN PVOID SystemArgument2)
{
PRTMPNTONSPECIFICARGS pArgs = (PRTMPNTONSPECIFICARGS)DeferredContext;
- RT_NOREF3(Dpc, SystemArgument1, SystemArgument2);
+ RT_NOREF(Dpc, SystemArgument1, SystemArgument2);
ASMAtomicWriteBool(&pArgs->fExecuting, true);
diff --git a/src/VBox/Runtime/r3/win/krnlmod-win.cpp b/src/VBox/Runtime/r3/win/krnlmod-win.cpp
index e9301fd8ad..46f0917f7f 100644
--- a/src/VBox/Runtime/r3/win/krnlmod-win.cpp
+++ b/src/VBox/Runtime/r3/win/krnlmod-win.cpp
@@ -124,7 +124,7 @@ static int rtKrnlModWinQueryKrnlMods(PRTL_PROCESS_MODULES *ppKrnlMods)
static int rtKrnlModWinInfoCreate(PRTL_PROCESS_MODULE_INFORMATION pModInfo, PRTKRNLMODINFO phKrnlModInfo)
{
int rc = VINF_SUCCESS;
- RT_NOREF2(pModInfo, phKrnlModInfo);
+ RT_NOREF(pModInfo, phKrnlModInfo);
size_t cchFilePath = strlen((const char *)&pModInfo->FullPathName[0]) + 1;
PRTKRNLMODINFOINT pThis = (PRTKRNLMODINFOINT)RTMemAllocZ(RT_OFFSETOF(RTKRNLMODINFOINT, achFilePath[cchFilePath]));
if (RT_LIKELY(pThis))
diff --git a/src/VBox/Runtime/testcase/tstRTVfs.cpp b/src/VBox/Runtime/testcase/tstRTVfs.cpp
index f6e394dc9c..edd2436567 100644
--- a/src/VBox/Runtime/testcase/tstRTVfs.cpp
+++ b/src/VBox/Runtime/testcase/tstRTVfs.cpp
@@ -83,7 +83,7 @@ static void tstVfsIoFromStandardHandle(RTTEST hTest, RTHANDLESTD enmHandle)
int main(int argc, char **argv)
{
- RT_NOREF2(argc, argv);
+ RT_NOREF(argc, argv);
/*
* Initialize IPRT and create the test.
diff --git a/src/VBox/Runtime/tools/RTDbgSymCache.cpp b/src/VBox/Runtime/tools/RTDbgSymCache.cpp
index 690e8f1407..ddb1d37263 100644
--- a/src/VBox/Runtime/tools/RTDbgSymCache.cpp
+++ b/src/VBox/Runtime/tools/RTDbgSymCache.cpp
@@ -591,7 +591,7 @@ static int rtDbgSymCacheAddDebugMachO(const char *pszPath, PCRTDBGSYMCACHEADDCFG
*/
static int rtDbgSymCacheAddDebugPdb(const char *pszPath, PCRTDBGSYMCACHEADDCFG pCfg, RTFILE hFile)
{
- RT_NOREF2(pCfg, hFile);
+ RT_NOREF(pCfg, hFile);
return RTMsgErrorRc(VERR_NOT_IMPLEMENTED, "PDB support not implemented: '%s'", pszPath);
}
@@ -1109,7 +1109,7 @@ static int rtDbgSymCacheAddDir(const char *pszPath, PCRTDBGSYMCACHEADDCFG pCfg)
static RTEXITCODE rtDbgSymCacheAddFileOrDir(const char *pszPath, const char *pszCache, bool fRecursive,
bool fOverwriteOnConflict)
{
- RT_NOREF1(fOverwriteOnConflict);
+ RT_NOREF(fOverwriteOnConflict);
RTDBGSYMCACHEADDCFG Cfg;
Cfg.fRecursive = fRecursive;
Cfg.pszCache = pszCache;
diff --git a/src/VBox/Runtime/tools/RTGzip.cpp b/src/VBox/Runtime/tools/RTGzip.cpp
index f10e223312..63f5d4243f 100644
--- a/src/VBox/Runtime/tools/RTGzip.cpp
+++ b/src/VBox/Runtime/tools/RTGzip.cpp
@@ -84,7 +84,7 @@ typedef RTGZIPCMDOPTS const *PCRTGZIPCMDOPTS;
static bool gzipIsStdHandleATty(RTHANDLESTD enmStdHandle)
{
/** @todo Add isatty() to IPRT. */
- RT_NOREF1(enmStdHandle);
+ RT_NOREF(enmStdHandle);
return false;
}
@@ -286,7 +286,7 @@ static RTEXITCODE gzipTestFile(PRTVFSIOSTREAM phVfsSrc, PCRTGZIPCMDOPTS pOpts)
static RTEXITCODE gzipListFile(PRTVFSIOSTREAM phVfsSrc, PCRTGZIPCMDOPTS pOpts)
{
- RT_NOREF2(phVfsSrc, pOpts);
+ RT_NOREF(phVfsSrc, pOpts);
return RTMsgErrorExit(RTEXITCODE_FAILURE, "Listing has not been implemented");
}
diff --git a/src/VBox/Storage/CUE.cpp b/src/VBox/Storage/CUE.cpp
index 536b601b4e..2c4f5e949b 100644
--- a/src/VBox/Storage/CUE.cpp
+++ b/src/VBox/Storage/CUE.cpp
@@ -946,7 +946,7 @@ static int cueParseTrack(PCUEIMAGE pThis, PCUETOKENIZER pTokenizer)
if (RT_SUCCESS(rc))
{
/* Create a new region for this track. */
- RT_NOREF1(enmDataMode);
+ RT_NOREF(enmDataMode);
rc = cueEnsureRegionListSize(pThis, u64Track);
if (RT_SUCCESS(rc))
{
diff --git a/src/VBox/Storage/ISCSI.cpp b/src/VBox/Storage/ISCSI.cpp
index c3692881bd..9dd78d5aa2 100644
--- a/src/VBox/Storage/ISCSI.cpp
+++ b/src/VBox/Storage/ISCSI.cpp
@@ -2654,7 +2654,7 @@ static int iscsiRecvPDUProcess(PISCSIIMAGE pImage, PISCSIRES paRes, uint32_t cnR
*/
static int iscsiValidatePDU(PISCSIRES paRes, uint32_t cnRes)
{
- RT_NOREF1(cnRes);
+ RT_NOREF(cnRes);
const uint32_t *pcrgResBHS;
uint32_t hw0;
Assert(cnRes >= 1);
diff --git a/src/VBox/Storage/Parallels.cpp b/src/VBox/Storage/Parallels.cpp
index 74d196d63d..12baf30079 100644
--- a/src/VBox/Storage/Parallels.cpp
+++ b/src/VBox/Storage/Parallels.cpp
@@ -278,7 +278,7 @@ static int parallelsCreateImage(PPARALLELSIMAGE pImage, uint64_t cbSize,
PFNVDPROGRESS pfnProgress, void *pvUser,
unsigned uPercentStart, unsigned uPercentSpan)
{
- RT_NOREF1(pszComment);
+ RT_NOREF(pszComment);
int rc = VINF_SUCCESS;
int32_t fOpen;
diff --git a/src/VBox/Storage/QCOW.cpp b/src/VBox/Storage/QCOW.cpp
index d32bc12a0d..35a0bc4547 100644
--- a/src/VBox/Storage/QCOW.cpp
+++ b/src/VBox/Storage/QCOW.cpp
@@ -1257,7 +1257,7 @@ static int qcowCreateImage(PQCOWIMAGE pImage, uint64_t cbSize,
PVDINTERFACEPROGRESS pIfProgress,
unsigned uPercentStart, unsigned uPercentSpan)
{
- RT_NOREF1(pszComment);
+ RT_NOREF(pszComment);
int rc;
int32_t fOpen;
@@ -1352,7 +1352,7 @@ static int qcowCreateImage(PQCOWIMAGE pImage, uint64_t cbSize,
*/
static int qcowAsyncClusterAllocRollback(PQCOWIMAGE pImage, PVDIOCTX pIoCtx, PQCOWCLUSTERASYNCALLOC pClusterAlloc)
{
- RT_NOREF1(pIoCtx);
+ RT_NOREF(pIoCtx);
int rc = VINF_SUCCESS;
switch (pClusterAlloc->enmAllocState)
diff --git a/src/VBox/Storage/QED.cpp b/src/VBox/Storage/QED.cpp
index 81233f542a..82dcd98658 100644
--- a/src/VBox/Storage/QED.cpp
+++ b/src/VBox/Storage/QED.cpp
@@ -1272,7 +1272,7 @@ static int qedCreateImage(PQEDIMAGE pImage, uint64_t cbSize,
PVDINTERFACEPROGRESS pIfProgress,
unsigned uPercentStart, unsigned uPercentSpan)
{
- RT_NOREF1(pszComment);
+ RT_NOREF(pszComment);
int rc;
if (!(uImageFlags & VD_IMAGE_FLAGS_FIXED))
@@ -1358,7 +1358,7 @@ static int qedCreateImage(PQEDIMAGE pImage, uint64_t cbSize,
*/
static int qedAsyncClusterAllocRollback(PQEDIMAGE pImage, PVDIOCTX pIoCtx, PQEDCLUSTERASYNCALLOC pClusterAlloc)
{
- RT_NOREF1(pIoCtx);
+ RT_NOREF(pIoCtx);
int rc = VINF_SUCCESS;
switch (pClusterAlloc->enmAllocState)
diff --git a/src/VBox/Storage/RAW.cpp b/src/VBox/Storage/RAW.cpp
index 7e918f77d8..4af6297f41 100644
--- a/src/VBox/Storage/RAW.cpp
+++ b/src/VBox/Storage/RAW.cpp
@@ -241,7 +241,7 @@ static int rawCreateImage(PRAWIMAGE pImage, uint64_t cbSize,
PVDINTERFACEPROGRESS pIfProgress,
unsigned uPercentStart, unsigned uPercentSpan)
{
- RT_NOREF1(pszComment);
+ RT_NOREF(pszComment);
int rc = VINF_SUCCESS;
pImage->fCreate = true;
diff --git a/src/VBox/Storage/VCICache.cpp b/src/VBox/Storage/VCICache.cpp
index 6c8b2c6dcd..eebc9d5f22 100644
--- a/src/VBox/Storage/VCICache.cpp
+++ b/src/VBox/Storage/VCICache.cpp
@@ -1300,7 +1300,7 @@ static int vciCreateImage(PVCICACHE pCache, uint64_t cbSize,
void *pvUser, unsigned uPercentStart,
unsigned uPercentSpan)
{
- RT_NOREF1(pszComment);
+ RT_NOREF(pszComment);
VciHdr Hdr;
VciTreeNode NodeRoot;
int rc;
diff --git a/src/VBox/Storage/VD.cpp b/src/VBox/Storage/VD.cpp
index 61dd0ae090..240c58d92b 100644
--- a/src/VBox/Storage/VD.cpp
+++ b/src/VBox/Storage/VD.cpp
@@ -1613,7 +1613,7 @@ static int vdIoCtxLockDisk(PVDISK pDisk, PVDIOCTX pIoCtx)
static void vdIoCtxUnlockDisk(PVDISK pDisk, PVDIOCTX pIoCtx, bool fProcessBlockedReqs)
{
- RT_NOREF1(pIoCtx);
+ RT_NOREF(pIoCtx);
LogFlowFunc(("pDisk=%#p pIoCtx=%#p fProcessBlockedReqs=%RTbool\n",
pDisk, pIoCtx, fProcessBlockedReqs));
@@ -1638,7 +1638,7 @@ static void vdIoCtxUnlockDisk(PVDISK pDisk, PVDIOCTX pIoCtx, bool fProcessBlocke
static int vdDiskReadHelper(PVDISK pDisk, PVDIMAGE pImage, PVDIMAGE pImageParentOverride,
uint64_t uOffset, size_t cbRead, PVDIOCTX pIoCtx, size_t *pcbThisRead)
{
- RT_NOREF1(pDisk);
+ RT_NOREF(pDisk);
int rc = VINF_SUCCESS;
size_t cbThisRead = cbRead;
diff --git a/src/VBox/Storage/VHD.cpp b/src/VBox/Storage/VHD.cpp
index 5736b3a5f8..662f9ecba5 100644
--- a/src/VBox/Storage/VHD.cpp
+++ b/src/VBox/Storage/VHD.cpp
@@ -1014,7 +1014,7 @@ static void vhdSetDiskGeometry(PVHDIMAGE pImage, uint64_t cbSize)
static uint32_t vhdAllocateParentLocators(PVHDIMAGE pImage, VHDDynamicDiskHeader *pDDH, uint64_t u64Offset)
{
- RT_NOREF1(pImage);
+ RT_NOREF(pImage);
PVHDPLE pLocator = pDDH->ParentLocatorEntry;
/*
@@ -1134,7 +1134,7 @@ static int vhdCreateImage(PVHDIMAGE pImage, uint64_t cbSize,
PVDINTERFACEPROGRESS pIfProgress,
unsigned uPercentStart, unsigned uPercentSpan)
{
- RT_NOREF3(pszComment, pPCHSGeometry, pLCHSGeometry);
+ RT_NOREF(pszComment, pPCHSGeometry, pLCHSGeometry);
VHDFooter Footer;
RTTIMESPEC now;
diff --git a/src/VBox/Storage/VMDK.cpp b/src/VBox/Storage/VMDK.cpp
index 25a049edf2..1d8a900afd 100644
--- a/src/VBox/Storage/VMDK.cpp
+++ b/src/VBox/Storage/VMDK.cpp
@@ -1021,7 +1021,7 @@ static int vmdkAllocStreamBuffers(PVMDKIMAGE pImage, PVMDKEXTENT pExtent)
*/
static int vmdkAllocGrainDirectory(PVMDKIMAGE pImage, PVMDKEXTENT pExtent)
{
- RT_NOREF1(pImage);
+ RT_NOREF(pImage);
int rc = VINF_SUCCESS;
size_t cbGD = pExtent->cGDEntries * sizeof(uint32_t);
@@ -1646,7 +1646,7 @@ static int vmdkDescBaseSetStr(PVMDKIMAGE pImage, PVMDKDESCRIPTOR pDescriptor,
static void vmdkDescExtRemoveDummy(PVMDKIMAGE pImage,
PVMDKDESCRIPTOR pDescriptor)
{
- RT_NOREF1(pImage);
+ RT_NOREF(pImage);
unsigned uEntry = pDescriptor->uFirstExtent;
ssize_t cbDiff;
@@ -4741,7 +4741,7 @@ static int vmdkAllocGrainGTUpdate(PVMDKIMAGE pImage, PVMDKEXTENT pExtent, PVDIOC
*/
static int vmdkAllocGrainComplete(void *pBackendData, PVDIOCTX pIoCtx, void *pvUser, int rcReq)
{
- RT_NOREF1(rcReq);
+ RT_NOREF(rcReq);
int rc = VINF_SUCCESS;
PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
PVMDKGRAINALLOCASYNC pGrainAlloc = (PVMDKGRAINALLOCASYNC)pvUser;
diff --git a/src/VBox/Storage/testcase/VDMemDisk.cpp b/src/VBox/Storage/testcase/VDMemDisk.cpp
index 3324809063..c66a581f85 100644
--- a/src/VBox/Storage/testcase/VDMemDisk.cpp
+++ b/src/VBox/Storage/testcase/VDMemDisk.cpp
@@ -341,7 +341,7 @@ int VDMemDiskWriteToFile(PVDMEMDISK pMemDisk, const char *pcszFilename)
int VDMemDiskReadFromFile(PVDMEMDISK pMemDisk, const char *pcszFilename)
{
- RT_NOREF2(pMemDisk, pcszFilename);
+ RT_NOREF(pMemDisk, pcszFilename);
return VERR_NOT_IMPLEMENTED;
}
diff --git a/src/VBox/Storage/testcase/VDScript.cpp b/src/VBox/Storage/testcase/VDScript.cpp
index 7e190302be..ac1dcb7dc3 100644
--- a/src/VBox/Storage/testcase/VDScript.cpp
+++ b/src/VBox/Storage/testcase/VDScript.cpp
@@ -889,7 +889,7 @@ static bool vdScriptTokenizerSkipIfIsOperatorEqual(PVDTOKENIZER pTokenizer, cons
*/
static int vdScriptParserError(PVDSCRIPTCTXINT pThis, int rc, RT_SRC_POS_DECL, const char *pszFmt, ...)
{
- RT_NOREF1(pThis); RT_SRC_POS_NOREF();
+ RT_NOREF(pThis); RT_SRC_POS_NOREF();
va_list va;
va_start(va, pszFmt);
RTPrintfV(pszFmt, va);
@@ -2523,7 +2523,7 @@ static int vdScriptParseFor(PVDSCRIPTCTXINT pThis, PVDSCRIPTASTFOR pAstNodeFor)
static int vdScriptParseDeclaration(PVDSCRIPTCTXINT pThis, PVDSCRIPTASTDECL *ppAstNodeDecl)
{
int rc = VERR_NOT_IMPLEMENTED;
- RT_NOREF2(pThis, ppAstNodeDecl);
+ RT_NOREF(pThis, ppAstNodeDecl);
return rc;
}
diff --git a/src/VBox/Storage/testcase/VDScriptInterp.cpp b/src/VBox/Storage/testcase/VDScriptInterp.cpp
index bf2db2d617..d6baf0384a 100644
--- a/src/VBox/Storage/testcase/VDScriptInterp.cpp
+++ b/src/VBox/Storage/testcase/VDScriptInterp.cpp
@@ -162,7 +162,7 @@ typedef VDSCRIPTINTERPCTRL *PVDSCRIPTINTERPCTRL;
*/
static int vdScriptInterpreterError(PVDSCRIPTINTERPCTX pThis, int rc, RT_SRC_POS_DECL, const char *pszFmt, ...)
{
- RT_NOREF1(pThis); RT_SRC_POS_NOREF();
+ RT_NOREF(pThis); RT_SRC_POS_NOREF();
va_list va;
va_start(va, pszFmt);
RTPrintfV(pszFmt, va);
diff --git a/src/VBox/Storage/testcase/tstVD.cpp b/src/VBox/Storage/testcase/tstVD.cpp
index 896f0a7033..c3a1cd683d 100644
--- a/src/VBox/Storage/testcase/tstVD.cpp
+++ b/src/VBox/Storage/testcase/tstVD.cpp
@@ -403,7 +403,7 @@ static void generateRandomSegments(PRNDCTX pCtx, PSEGMENT pSegment, uint32_t nSe
static void mergeSegments(PSEGMENT pBaseSegment, PSEGMENT pDiffSegment, PSEGMENT pMergeSegment, uint32_t u32MaxLength)
{
- RT_NOREF1(u32MaxLength);
+ RT_NOREF(u32MaxLength);
while (pBaseSegment->u32Length > 0 || pDiffSegment->u32Length > 0)
{
diff --git a/src/VBox/Storage/testcase/tstVDSnap.cpp b/src/VBox/Storage/testcase/tstVDSnap.cpp
index 9faa3fda6e..c9c2bbd1a6 100644
--- a/src/VBox/Storage/testcase/tstVDSnap.cpp
+++ b/src/VBox/Storage/testcase/tstVDSnap.cpp
@@ -126,7 +126,7 @@ static void tstVDSnapSegmentsDice(PVDSNAPTEST pTest, PVDDISKSEG paDiskSeg, uint3
static int tstVDSnapWrite(PVDISK pVD, PVDDISKSEG paDiskSegments, uint32_t cDiskSegments, uint64_t cbDisk, bool fInit)
{
- RT_NOREF1(cbDisk);
+ RT_NOREF(cbDisk);
int rc = VINF_SUCCESS;
for (uint32_t i = 0; i < cDiskSegments; i++)
@@ -153,7 +153,7 @@ static int tstVDSnapWrite(PVDISK pVD, PVDDISKSEG paDiskSegments, uint32_t cDiskS
static int tstVDSnapReadVerify(PVDISK pVD, PVDDISKSEG paDiskSegments, uint32_t cDiskSegments, uint64_t cbDisk)
{
- RT_NOREF1(cbDisk);
+ RT_NOREF(cbDisk);
int rc = VINF_SUCCESS;
uint8_t *pbBuf = (uint8_t *)RTMemAlloc(_1M);
diff --git a/src/VBox/VMM/VMMR3/PDM.cpp b/src/VBox/VMM/VMMR3/PDM.cpp
index e9d6a7742a..6ddf0d7981 100644
--- a/src/VBox/VMM/VMMR3/PDM.cpp
+++ b/src/VBox/VMM/VMMR3/PDM.cpp
@@ -640,7 +640,7 @@ VMMR3_INT_DECL(void) PDMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
*/
static void pdmR3TermLuns(PVM pVM, PPDMLUN pLun, const char *pszDevice, unsigned iInstance)
{
- RT_NOREF2(pszDevice, iInstance);
+ RT_NOREF(pszDevice, iInstance);
for (; pLun; pLun = pLun->pNext)
{
diff --git a/src/VBox/VMM/VMMR3/VM.cpp b/src/VBox/VMM/VMMR3/VM.cpp
index fed03a7a62..08a3f30bc7 100644
--- a/src/VBox/VMM/VMMR3/VM.cpp
+++ b/src/VBox/VMM/VMMR3/VM.cpp
@@ -3288,7 +3288,7 @@ VMMR3DECL(const char *) VMR3GetStateName(VMSTATE enmState)
static bool vmR3ValidateStateTransition(VMSTATE enmStateOld, VMSTATE enmStateNew)
{
#ifndef VBOX_STRICT
- RT_NOREF2(enmStateOld, enmStateNew);
+ RT_NOREF(enmStateOld, enmStateNew);
#else
switch (enmStateOld)
{
diff --git a/src/VBox/VMM/tools/VBoxCpuReport.cpp b/src/VBox/VMM/tools/VBoxCpuReport.cpp
index 84b741c240..543ed72555 100644
--- a/src/VBox/VMM/tools/VBoxCpuReport.cpp
+++ b/src/VBox/VMM/tools/VBoxCpuReport.cpp
@@ -2671,7 +2671,7 @@ static bool isMsrViaDummy(uint32_t uMsr, uint64_t uValue, uint32_t fFlags)
*/
static void adjustCanonicalIgnAndGpMasks(uint32_t uMsr, uint64_t *pfIgn, uint64_t *pfGp)
{
- RT_NOREF1(pfIgn);
+ RT_NOREF(pfIgn);
if (!vbCpuRepSupportsLongMode())
return;
switch (uMsr)
diff --git a/src/VBox/ValidationKit/utils/nt/nttimesources.cpp b/src/VBox/ValidationKit/utils/nt/nttimesources.cpp
index de74eab15c..d8eaf701e5 100644
--- a/src/VBox/ValidationKit/utils/nt/nttimesources.cpp
+++ b/src/VBox/ValidationKit/utils/nt/nttimesources.cpp
@@ -83,7 +83,7 @@ static void DelayMillies(DWORD dwMsStart, DWORD cMillies)
int main(int argc, char **argv)
{
- RT_NOREF1(argv);
+ RT_NOREF(argv);
/*
* Init, create a test instance and "parse" arguments.
diff --git a/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetHostUsbIp.cpp b/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetHostUsbIp.cpp
index f92eaa3116..eca94cfa6a 100644
--- a/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetHostUsbIp.cpp
+++ b/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetHostUsbIp.cpp
@@ -77,7 +77,7 @@ typedef struct UTSGADGETHOSTTYPEINT
*/
static int usbGadgetHostUsbIpBindUnbind(PUTSGADGETHOSTTYPEINT pThis, UTSGADGET hGadget, bool fBind)
{
- RT_NOREF1(pThis);
+ RT_NOREF(pThis);
uint32_t uBusId, uDevId;
char aszBus[32];
diff --git a/src/bldprogs/scm.cpp b/src/bldprogs/scm.cpp
index 54ec988577..48962e22e1 100644
--- a/src/bldprogs/scm.cpp
+++ b/src/bldprogs/scm.cpp
@@ -1294,7 +1294,7 @@ static int scmSettingsBaseVerifyString(const char *pszOptions)
static int scmSettingsBaseLoadFromDocument(PSCMSETTINGSBASE pBase, PSCMSTREAM pStream)
{
/** @todo Editor and SCM settings directives in documents. */
- RT_NOREF2(pBase, pStream);
+ RT_NOREF(pBase, pStream);
return VINF_SUCCESS;
}
diff --git a/src/bldprogs/scmrw.cpp b/src/bldprogs/scmrw.cpp
index 6233bd6794..9174e6285b 100644
--- a/src/bldprogs/scmrw.cpp
+++ b/src/bldprogs/scmrw.cpp
@@ -818,7 +818,7 @@ bool rewrite_AdjustTrailingLines(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM
*/
bool rewrite_SvnNoExecutable(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
{
- RT_NOREF2(pIn, pOut);
+ RT_NOREF(pIn, pOut);
if ( !pSettings->fSetSvnExecutable
|| !ScmSvnIsInWorkingCopy(pState))
return false;
@@ -845,7 +845,7 @@ bool rewrite_SvnNoExecutable(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut
*/
bool rewrite_SvnNoKeywords(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
{
- RT_NOREF2(pIn, pOut);
+ RT_NOREF(pIn, pOut);
if ( !pSettings->fSetSvnExecutable
|| !ScmSvnIsInWorkingCopy(pState))
return false;
@@ -872,7 +872,7 @@ bool rewrite_SvnNoKeywords(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut,
*/
bool rewrite_SvnNoEolStyle(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
{
- RT_NOREF2(pIn, pOut);
+ RT_NOREF(pIn, pOut);
if ( !pSettings->fSetSvnExecutable
|| !ScmSvnIsInWorkingCopy(pState))
return false;
@@ -899,7 +899,7 @@ bool rewrite_SvnNoEolStyle(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut,
*/
bool rewrite_SvnBinary(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
{
- RT_NOREF2(pIn, pOut);
+ RT_NOREF(pIn, pOut);
if ( !pSettings->fSetSvnExecutable
|| !ScmSvnIsInWorkingCopy(pState))
return false;
@@ -948,7 +948,7 @@ bool rewrite_SvnBinary(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSC
*/
bool rewrite_SvnKeywords(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
{
- RT_NOREF2(pIn, pOut);
+ RT_NOREF(pIn, pOut);
if ( !pSettings->fSetSvnKeywords
|| !ScmSvnIsInWorkingCopy(pState))
return false;
@@ -1910,7 +1910,7 @@ bool rewrite_Copyright_TickComment(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREA
*/
bool rewrite_Makefile_kup(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
{
- RT_NOREF2(pOut, pSettings);
+ RT_NOREF(pOut, pSettings);
/* These files should be zero bytes. */
if (pIn->cb == 0)
@@ -1935,7 +1935,7 @@ bool rewrite_Makefile_kup(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, P
*/
bool rewrite_Makefile_kmk(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
{
- RT_NOREF4(pState, pIn, pOut, pSettings);
+ RT_NOREF(pState, pIn, pOut, pSettings);
return false;
}
@@ -2365,7 +2365,7 @@ bool rewrite_Fix_C_and_CPP_Todos(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM
bool rewrite_C_and_CPP(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
{
- RT_NOREF4(pState, pIn, pOut, pSettings);
+ RT_NOREF(pState, pIn, pOut, pSettings);
return false;
}
--
2.15.1
More information about the vbox-dev
mailing list