Changeset 62993 in vbox

Timestamp:

Aug 4, 2016 3:11:32 PM (8 years ago)

Author:

vboxsync

Message:

Devices: warnings

File:

• trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp

@@ -330 +330 @@
     /* Get handle of the first logical configuration. */
     LOG_CONF  hFirstLogConf;
-    short     wHeaderSize = sizeof(IO_DES);
     CONFIGRET rcCm = CM_Get_First_Log_Conf(&hFirstLogConf, DevInst, ALLOC_LOG_CONF);
     if (rcCm != CR_SUCCESS)
@@ -530 +529 @@
 static int drvHostParallelSetMode(PDRVHOSTPARALLEL pThis, PDMPARALLELPORTMODE enmMode)
 {
+    LogFlowFunc(("mode=%d\n", enmMode));
+# ifndef VBOX_WITH_WIN_PARPORT_SUP
+    int rc = VINF_SUCCESS;
     int iMode = 0;
-    int rc = VINF_SUCCESS;
-    LogFlowFunc(("mode=%d\n", enmMode));
-
-# ifndef VBOX_WITH_WIN_PARPORT_SUP
     int rcLnx;
     if (pThis->enmModeCur != enmMode)
@@ -564 +562 @@
     return rc;
 # else  /* VBOX_WITH_WIN_PARPORT_SUP */
+    RT_NOREF(pThis, enmMode);
     return VINF_SUCCESS;
 # endif /* VBOX_WITH_WIN_PARPORT_SUP */
@@ -589 +588 @@
  * @interface_method_impl{PDMIHOSTPARALLELCONNECTOR,pfnWrite}
  */
-static DECLCALLBACK(int) drvHostParallelWrite(PPDMIHOSTPARALLELCONNECTOR pInterface, const void *pvBuf, size_t cbWrite,
-                                              PDMPARALLELPORTMODE enmMode)
-{
-    PPDMDRVINS          pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
-    //PDRVHOSTPARALLEL    pThis   = PDMINS_2_DATA(pDrvIns, PDRVHOSTPARALLEL);
-    PDRVHOSTPARALLEL    pThis   = RT_FROM_MEMBER(pInterface, DRVHOSTPARALLEL, CTX_SUFF(IHostParallelConnector));
+static DECLCALLBACK(int)
+drvHostParallelWrite(PPDMIHOSTPARALLELCONNECTOR pInterface, const void *pvBuf, size_t cbWrite, PDMPARALLELPORTMODE enmMode)
+{
+    PDRVHOSTPARALLEL pThis = RT_FROM_MEMBER(pInterface, DRVHOSTPARALLEL, CTX_SUFF(IHostParallelConnector));
     int rc = VINF_SUCCESS;
-    int rcLnx = 0;
 
     LogFlowFunc(("pvBuf=%#p cbWrite=%d\n", pvBuf, cbWrite));
@@ -604 +600 @@
         return rc;
 # ifndef VBOX_WITH_WIN_PARPORT_SUP
+    int rcLnx = 0;
     if (enmMode == PDM_PARALLEL_PORT_MODE_SPP)
     {
@@ -638 +635 @@
  * @interface_method_impl{PDMIHOSTPARALLELCONNECTOR,pfnRead}
  */
-static DECLCALLBACK(int) drvHostParallelRead(PPDMIHOSTPARALLELCONNECTOR pInterface, void *pvBuf, size_t cbRead,
-                                             PDMPARALLELPORTMODE enmMode)
-{
-    PDRVHOSTPARALLEL    pThis   = RT_FROM_MEMBER(pInterface, DRVHOSTPARALLEL, CTX_SUFF(IHostParallelConnector));
+static DECLCALLBACK(int)
+drvHostParallelRead(PPDMIHOSTPARALLELCONNECTOR pInterface, void *pvBuf, size_t cbRead, PDMPARALLELPORTMODE enmMode)
+{
+    PDRVHOSTPARALLEL pThis = RT_FROM_MEMBER(pInterface, DRVHOSTPARALLEL, CTX_SUFF(IHostParallelConnector));
     int rc = VINF_SUCCESS;
 
@@ -666 +663 @@
 
 # else  /* VBOX_WITH_WIN_PARPORT_SUP */
+    RT_NOREF(enmMode);
     if (pThis->PortDirectData != 0)
     {
@@ -870 +868 @@
 static DECLCALLBACK(void) drvHostParallelDestruct(PPDMDRVINS pDrvIns)
 {
+    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
+    LogFlowFunc(("iInstance=%d\n", pDrvIns->iInstance));
+
+#ifndef VBOX_WITH_WIN_PARPORT_SUP
     PDRVHOSTPARALLEL pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTPARALLEL);
-    LogFlowFunc(("iInstance=%d\n", pDrvIns->iInstance));
-    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
-
-#ifndef VBOX_WITH_WIN_PARPORT_SUP
     if (pThis->hFileDevice != NIL_RTFILE)
         ioctl(RTFileToNative(pThis->hFileDevice), PPRELEASE);
@@ -911 +909 @@
 static DECLCALLBACK(int) drvHostParallelConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
+    RT_NOREF(fFlags);
+    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
+    LogFlowFunc(("iInstance=%d\n", pDrvIns->iInstance));
     PDRVHOSTPARALLEL pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTPARALLEL);
-    LogFlowFunc(("iInstance=%d\n", pDrvIns->iInstance));
-
-    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
+
 
     /*