Changeset 44204 in vbox for trunk/src/VBox

Timestamp:

Dec 25, 2012 4:30:34 PM (12 years ago)

Author:

vboxsync

Message:

HostDrivers/solaris: wrap to 130 columns.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (15 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -787 +787 @@
         && g_VBoxNetFltSolarisStreamType != kIp4Stream)
     {
-        LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed due to undefined VirtualBox open mode. Type=%d\n", g_VBoxNetFltSolarisStreamType));
+        LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed due to undefined VirtualBox open mode. Type=%d\n",
+                g_VBoxNetFltSolarisStreamType));
         return ENOENT;
     }
@@ -1124 +1125 @@
                             if (MBLKL(pMsg) < DL_NOTIFY_IND_SIZE)
                             {
-                                LogRel((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: Invalid notification size; expected>=%d got=%d\n",
-                                            DL_NOTIFY_IND_SIZE, MBLKL(pMsg)));
+                                LogRel((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: Invalid notification size; expected>=%d"
+                                        " got=%d\n", DL_NOTIFY_IND_SIZE, MBLKL(pMsg)));
                                 break;
                             }
@@ -1142 +1143 @@
                                     if (!cOffset || !cbAddr)
                                     {
-                                        LogRel((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_NOTE_PHYS_ADDR. Invalid offset/addr.\n"));
+                                        LogRel((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_NOTE_PHYS_ADDR."
+                                                "Invalid offset/addr.\n"));
                                         fSendUpstream = false;
                                         break;
@@ -1467 +1469 @@
     {
         PVBOXNETFLTINS pThis = pParams->pThis;
-        vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtrT(&pThis->u.s.pPromiscStream, vboxnetflt_promisc_stream_t *);
+        vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtrT(&pThis->u.s.pPromiscStream,
+                                                                          vboxnetflt_promisc_stream_t *);
         if (   pPromiscStream
             && pPromiscStream->Stream.pReadQueue)
@@ -1644 +1647 @@
             else
             {
-                LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenDev failed. pUser=%p fp=%p f_vnode=%p\n", pUser, pUser ? pUser->fp : NULL,
-                                    pUser && pUser->fp ? VNODE_FOR_FILE_T(pUser->fp) : NULL));
+                LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenDev failed. pUser=%p fp=%p f_vnode=%p\n", pUser,
+                        pUser ? pUser->fp : NULL, pUser && pUser->fp ? VNODE_FOR_FILE_T(pUser->fp) : NULL));
             }
 
@@ -1722 +1725 @@
                 else                                            /* Garbled reply */
                 {
-                    LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachReq ldi_getmsg succeeded, but invalid op. expected %d recvd %d\n",
-                        DL_OK_ACK, AckPrim));
+                    LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachReq ldi_getmsg succeeded, but invalid op."
+                            " expected %d recvd %d\n", DL_OK_ACK, AckPrim));
                     rc = VERR_INVALID_FUNCTION;
                 }
@@ -2382 +2385 @@
                             }
                             else
-                                LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachIp4: failed to find position. rc=%d rc2=%d\n", rc, rc2));
+                            {
+                                LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachIp4: failed to find position. rc=%d rc2=%d\n", rc,
+                                        rc2));
+                            }
 
                             releasef(Ip4MuxFd);
@@ -2391 +2397 @@
                     }
                     else
-                        LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachIp4: failed to unlink upper stream rc=%d rc2=%d.\n", rc, rc2));
+                    {
+                        LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachIp4: failed to unlink upper stream rc=%d rc2=%d.\n", rc,
+                                rc2));
+                    }
                 }
                 else
@@ -2680 +2689 @@
             if (Interval < 1 || Interval > 120)
             {
-                LogRel((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Invalid polling interval %d. Expected between 1 and 120 secs.\n",
-                                    Interval));
+                LogRel((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Invalid polling interval %d. Expected between"
+                        " 1 and 120 secs.\n", Interval));
                 return VERR_INVALID_PARAMETER;
             }
@@ -2693 +2702 @@
             {
                 rc = RTTimerStart(pPromiscStream->pIp6Timer, 10 * (uint64_t)1000000000 /* 10 seconds to blastoff */);
-                Log((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Ipv6 %d second timer begins firing in 10 seconds.\n", Interval));
+                Log((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Ipv6 %d second timer begins firing in 10 seconds.\n",
+                     Interval));
             }
             else
@@ -3479 +3489 @@
                     else
                     {
-                        LogRel((DEVICE_NAME ":vboxNetFltSolarisRecv insufficient memory for creating VLAN stripped packet cbMsg=%u.\n",
-                                    cbEthPrefix));
+                        LogRel((DEVICE_NAME ":vboxNetFltSolarisRecv insufficient memory for creating VLAN stripped packet"
+                                " cbMsg=%u.\n", cbEthPrefix));
                         if (fCopied)
                             freemsg(pMsg);
@@ -3696 +3706 @@
     {
         PVLANHEADER pVlanHdr = (PVLANHEADER)(pMsg->b_rptr + sizeof(RTNETETHERHDR) - sizeof(pEthHdr->EtherType));
-        LogRel((DEVICE_NAME ":VLAN Pcp=%u Cfi=%u Id=%u\n", VLAN_PRI(RT_BE2H_U16(pVlanHdr->Data)), VLAN_CFI(RT_BE2H_U16(pVlanHdr->Data)), VLAN_ID(RT_BE2H_U16(pVlanHdr->Data))));
+        LogRel((DEVICE_NAME ":VLAN Pcp=%u Cfi=%u Id=%u\n", VLAN_PRI(RT_BE2H_U16(pVlanHdr->Data)),
+               VLAN_CFI(RT_BE2H_U16(pVlanHdr->Data)), VLAN_ID(RT_BE2H_U16(pVlanHdr->Data))));
         LogRel((DEVICE_NAME "%.*Rhxd\n", sizeof(VLANHEADER), pVlanHdr));
     }
@@ -3741 +3752 @@
          * See @bugref{5262} as to why we need to do all this qtimeout/qwriter tricks.
          */
-        vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtrT(&pThis->u.s.pPromiscStream, vboxnetflt_promisc_stream_t *);
+        vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtrT(&pThis->u.s.pPromiscStream,
+                                                                          vboxnetflt_promisc_stream_t *);
         if (   pPromiscStream
             && pPromiscStream->Stream.pReadQueue)
@@ -3749 +3761 @@
             if (ASMAtomicReadPtr(&pPromiscStream->TimeoutId))
                 quntimeout(WR(pPromiscStream->Stream.pReadQueue), pPromiscStream->TimeoutId);
-            timeout_id_t TimeoutId = qtimeout(WR(pPromiscStream->Stream.pReadQueue), vboxNetFltSolarisPromiscReqWrap, pData, 1 /* ticks */);
+            timeout_id_t TimeoutId = qtimeout(WR(pPromiscStream->Stream.pReadQueue), vboxNetFltSolarisPromiscReqWrap,
+                                              pData, 1 /* ticks */);
             ASMAtomicWritePtr(&pPromiscStream->TimeoutId, TimeoutId);
             return; /* pData will be freed by vboxNetFltSolarisPromiscReqWrap() */
@@ -3891 +3904 @@
     if (fDst & INTNETTRUNKDIR_WIRE)
     {
-        vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtrT(&pThis->u.s.pPromiscStream, vboxnetflt_promisc_stream_t *);
+        vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtrT(&pThis->u.s.pPromiscStream,
+                                                                          vboxnetflt_promisc_stream_t *);
         if (RT_LIKELY(pPromiscStream))
         {