VirtualBox

Ignore:
Timestamp:
Apr 22, 2016 7:37:54 AM (9 years ago)
Author:
vboxsync
Message:

HostDrivers/win: coding style

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h

    r56293 r60639  
    8181{
    8282    PLIST_ENTRY pListEntry = RemoveHeadList(pQueue);
    83     if(pListEntry != pQueue)
     83    if (pListEntry != pQueue)
    8484    {
    8585        PVBOXNETFLT_PACKET_INFO pInfo = LIST_ENTRY_2_PACKET_INFO(pListEntry);
     
    9393{
    9494    PLIST_ENTRY pListEntry = RemoveTailList(pQueue);
    95     if(pListEntry != pQueue)
     95    if (pListEntry != pQueue)
    9696    {
    9797        PVBOXNETFLT_PACKET_INFO pInfo = LIST_ENTRY_2_PACKET_INFO(pListEntry);
     
    192192    PSINGLE_LIST_ENTRY pCur;
    193193    PSINGLE_LIST_ENTRY pPrev;
    194     for(pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)
    195     {
    196         if(pEntry2Search == pCur)
     194    for (pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)
     195    {
     196        if (pEntry2Search == pCur)
    197197        {
    198             if(bRemove)
     198            if (bRemove)
    199199            {
    200200                pPrev->Next = pCur->Next;
    201                 if(pCur == pList->pTail)
     201                if (pCur == pList->pTail)
    202202                {
    203203                    pList->pTail = pPrev;
     
    218218    PSINGLE_LIST_ENTRY pPrev;
    219219    PNDIS_PACKET pCurPacket;
    220     for(pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)
     220    for (pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)
    221221    {
    222222        pCurPacket = VBOX_SLE_2_SENDPACKET(pCur);
    223         if(pCurPacket == pPacket2Search || vboxNetFltWinMatchPackets(pPacket2Search, pCurPacket, cbMatch))
     223        if (pCurPacket == pPacket2Search || vboxNetFltWinMatchPackets(pPacket2Search, pCurPacket, cbMatch))
    224224        {
    225             if(bRemove)
     225            if (bRemove)
    226226            {
    227227                pPrev->Next = pCur->Next;
    228                 if(pCur == pList->pTail)
     228                if (pCur == pList->pTail)
    229229                {
    230230                    pList->pTail = pPrev;
     
    243243    PSINGLE_LIST_ENTRY pPrev;
    244244    PNDIS_PACKET pCurPacket;
    245     for(pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)
     245    for (pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)
    246246    {
    247247        pCurPacket = VBOX_SLE_2_SENDPACKET(pCur);
    248         if(vboxNetFltWinMatchPacketAndSG(pCurPacket, pSG, cbMatch))
     248        if (vboxNetFltWinMatchPacketAndSG(pCurPacket, pSG, cbMatch))
    249249        {
    250             if(bRemove)
     250            if (bRemove)
    251251            {
    252252                pPrev->Next = pCur->Next;
    253                 if(pCur == pList->pTail)
     253                if (pCur == pList->pTail)
    254254                {
    255255                    pList->pTail = pPrev;
     
    280280    pEntry->Next = pList->Head.Next;
    281281    pList->Head.Next = pEntry;
    282     if(!pEntry->Next)
     282    if (!pEntry->Next)
    283283        pList->pTail = pEntry;
    284284}
     
    287287{
    288288    PSINGLE_LIST_ENTRY pEntry = pList->Head.Next;
    289     if(pEntry && pEntry == pList->pTail)
     289    if (pEntry && pEntry == pList->pTail)
    290290    {
    291291        pList->Head.Next = NULL;
     
    589589    RTSpinlockAcquire((pNetFlt)->hSpinlock);
    590590#ifndef VBOXNETADP
    591     if(!vboxNetFltWinDoReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState))
    592 #else
    593     if(!vboxNetFltWinDoReferenceDevice(&pNetFlt->u.s.WinIf.MpState))
     591    if (!vboxNetFltWinDoReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState))
     592#else
     593    if (!vboxNetFltWinDoReferenceDevice(&pNetFlt->u.s.WinIf.MpState))
    594594#endif
    595595    {
     
    599599    }
    600600
    601     if(pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
     601    if (pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
    602602    {
    603603        vboxNetFltWinReferenceModePassThru(pNetFlt);
     
    620620
    621621    Assert(v);
    622     if(!v)
     622    if (!v)
    623623    {
    624624        *pbNetFltActive = false;
     
    628628    RTSpinlockAcquire((pNetFlt)->hSpinlock);
    629629#ifndef VBOXNETADP
    630     if(!vboxNetFltWinDoIncReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState, v))
    631 #else
    632     if(!vboxNetFltWinDoIncReferenceDevice(&pNetFlt->u.s.WinIf.MpState, v))
     630    if (!vboxNetFltWinDoIncReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState, v))
     631#else
     632    if (!vboxNetFltWinDoIncReferenceDevice(&pNetFlt->u.s.WinIf.MpState, v))
    633633#endif
    634634    {
     
    638638    }
    639639
    640     if(pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
     640    if (pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
    641641    {
    642642        vboxNetFltWinIncReferenceModePassThru(pNetFlt, v);
     
    654654
    655655    /* we have marked it as busy, so can do the res references outside the lock */
    656     for(i = 0; i < v-1; i++)
     656    for (i = 0; i < v-1; i++)
    657657    {
    658658        vboxNetFltRetain(pNetFlt, true /* fBusy */);
     
    667667{
    668668    uint32_t i;
    669     for(i = 0; i < n; i++)
     669    for (i = 0; i < n; i++)
    670670    {
    671671        vboxNetFltRelease(pNetFlt, true);
     
    703703{
    704704    Assert(v);
    705     if(!v)
     705    if (!v)
    706706    {
    707707        return false;
     
    710710    RTSpinlockAcquire(pNetFlt->hSpinlock);
    711711#ifdef VBOXNETADP
    712     if(vboxNetFltWinDoIncReferenceDevice(&pNetFlt->u.s.WinIf.MpState, v))
    713 #else
    714     if(vboxNetFltWinDoIncReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState, v))
     712    if (vboxNetFltWinDoIncReferenceDevice(&pNetFlt->u.s.WinIf.MpState, v))
     713#else
     714    if (vboxNetFltWinDoIncReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState, v))
    715715#endif
    716716    {
     
    727727    RTSpinlockAcquire(pNetFlt->hSpinlock);
    728728#ifdef VBOXNETADP
    729     if(vboxNetFltWinDoReferenceDevice(&pNetFlt->u.s.WinIf.MpState))
    730 #else
    731     if(vboxNetFltWinDoReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState))
     729    if (vboxNetFltWinDoReferenceDevice(&pNetFlt->u.s.WinIf.MpState))
     730#else
     731    if (vboxNetFltWinDoReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState))
    732732#endif
    733733    {
Note: See TracChangeset for help on using the changeset viewer.

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