LteMac*: rename confusing local variable (header -> macPdu)

Author: avarga

src/simu5g/stack/mac/LteMacEnb.cc

@@ -599,7 +599,6 @@ void LteMacEnb::macPduMake(MacCid cid)
             UnitList txList = (txBuf->firstAvailable());
 
             auto macPacket = pit.second;
-            auto header = macPacket->peekAtFront<LteMacPdu>();
             EV << "LteMacBase: PDU Maker created PDU: " << macPacket->str() << endl;
 
             // PDU transmission here (if any)

src/simu5g/stack/mac/LteMacUe.cc

@@ -415,9 +415,9 @@ void LteMacUe::macPduMake(MacCid cid)  //TODO note cid is unused here!!!!
                 auto pkt = check_and_cast<Packet *>(mbuf_[destCid]->popFront());
                 drop(pkt);
 
-                auto header = macPkt->removeAtFront<LteMacPdu>();
-                header->pushSdu(pkt);
-                macPkt->insertAtFront(header);
+                auto macPdu = macPkt->removeAtFront<LteMacPdu>();
+                macPdu->pushSdu(pkt);
+                macPkt->insertAtFront(macPdu);
                 sduPerCid--;
             }
             // consider virtual buffers to compute BSR size
@@ -533,13 +533,13 @@ void LteMacUe::macPduMake(MacCid cid)  //TODO note cid is unused here!!!!
             //        }
 
             bool bsrAlreadyMade = false;
-            auto header = macPkt->removeAtFront<LteMacPdu>();
+            auto macPdu = macPkt->removeAtFront<LteMacPdu>();
             if (bsrTriggered_) {
                 MacBsr *bsr = new MacBsr();
 
                 bsr->setTimestamp(simTime().dbl());
                 bsr->setSize(size);
-                header->pushCe(bsr);
+                macPdu->pushCe(bsr);
 
                 bsrTriggered_ = false;
                 bsrAlreadyMade = true;
@@ -553,7 +553,7 @@ void LteMacUe::macPduMake(MacCid cid)  //TODO note cid is unused here!!!!
                 bsrRtxTimer_ = 0;
 
             // insert updated MacPdu
-            macPkt->insertAtFront(header);
+            macPkt->insertAtFront(macPdu);
 
             EV << "LteMacUe: pduMaker created PDU: " << macPkt->str() << endl;
 

src/simu5g/stack/mac/LteMacUeD2D.cc

@@ -243,9 +243,9 @@ void LteMacUeD2D::macPduMake(MacCid cid)
 
                     drop(pkt);
 
-                    auto header = macPkt->removeAtFront<LteMacPdu>();
-                    header->pushSdu(pkt);
-                    macPkt->insertAtFront(header);
+                    auto macPdu = macPkt->removeAtFront<LteMacPdu>();
+                    macPdu->pushSdu(pkt);
+                    macPkt->insertAtFront(macPdu);
                     sduPerCid--;
                 }
 
@@ -375,13 +375,13 @@ void LteMacUeD2D::macPduMake(MacCid cid)
                //
                //        }
 
-            auto header = macPkt->removeAtFront<LteMacPdu>();
+            auto macPdu = macPkt->removeAtFront<LteMacPdu>();
             // Attach BSR to PDU if RAC is won and wasn't already made
             if ((bsrTriggered_ || bsrD2DMulticastTriggered_) && !bsrAlreadyMade && size > 0) {
                 MacBsr *bsr = new MacBsr();
                 bsr->setTimestamp(simTime().dbl());
                 bsr->setSize(size);
-                header->pushCe(bsr);
+                macPdu->pushCe(bsr);
                 bsrTriggered_ = false;
                 bsrD2DMulticastTriggered_ = false;
                 bsrAlreadyMade = true;
@@ -393,7 +393,7 @@ void LteMacUeD2D::macPduMake(MacCid cid)
             else
                 bsrRtxTimer_ = 0;
 
-            macPkt->insertAtFront(header);
+            macPkt->insertAtFront(macPdu);
 
             EV << "LteMacUeD2D: pduMaker created PDU: " << macPkt->str() << endl;
 

src/simu5g/stack/mac/NrMacUe.cc

@@ -449,9 +449,9 @@ void NrMacUe::macPduMake(MacCid cid)
 
                     drop(pkt);
 
-                    auto header = macPkt->removeAtFront<LteMacPdu>();
-                    header->pushSdu(pkt);
-                    macPkt->insertAtFront(header);
+                    auto macPdu = macPkt->removeAtFront<LteMacPdu>();
+                    macPdu->pushSdu(pkt);
+                    macPkt->insertAtFront(macPdu);
                     sduPerCid--;
                 }
 
@@ -581,13 +581,13 @@ void NrMacUe::macPduMake(MacCid cid)
                //
                //        } */
 
-            auto header = macPkt->removeAtFront<LteMacPdu>();
+            auto macPdu = macPkt->removeAtFront<LteMacPdu>();
             // Attach BSR to PDU if RAC is won and wasn't already made
             if ((bsrTriggered_ || bsrD2DMulticastTriggered_) && !bsrAlreadyMade && size > 0) {
                 MacBsr *bsr = new MacBsr();
                 bsr->setTimestamp(simTime().dbl());
                 bsr->setSize(size);
-                header->pushCe(bsr);
+                macPdu->pushCe(bsr);
                 bsrTriggered_ = false;
                 bsrD2DMulticastTriggered_ = false;
                 bsrAlreadyMade = true;
@@ -600,7 +600,7 @@ void NrMacUe::macPduMake(MacCid cid)
             else
                 bsrRtxTimer_ = 0;
 
-            macPkt->insertAtFront(header);
+            macPkt->insertAtFront(macPdu);
 
             EV << "NrMacUe: pduMaker created PDU: " << macPkt->str() << endl;