[core] Minor fix of variable shadowing.

maxsharabayko · maxsharabayko · commit 30e7ccdf1f6b · 2023-04-25T15:38:53.000+02:00
diff --git a/srtcore/api.cpp b/srtcore/api.cpp
@@ -674,7 +674,7 @@ int srt::CUDTUnited::newConnection(const SRTSOCKET     listen,
             // XXX this might require another check of group type.
             // For redundancy group, at least, update the status in the group
             CUDTGroup* g = ns->m_GroupOf;
-            ScopedLock glock(g->m_GroupLock);
+            ScopedLock grlock(g->m_GroupLock);
             if (g->m_bClosing)
             {
                 error = 1; // "INTERNAL REJECTION"
diff --git a/srtcore/core.cpp b/srtcore/core.cpp
@@ -9726,8 +9726,6 @@ void srt::CUDT::processClose()
 
 void srt::CUDT::sendLossReport(const std::vector<std::pair<int32_t, int32_t> > &loss_seqs)
 {
-    typedef vector<pair<int32_t, int32_t> > loss_seqs_t;
-
     vector<int32_t> seqbuffer;
     seqbuffer.reserve(2 * loss_seqs.size()); // pessimistic
     for (loss_seqs_t::const_iterator i = loss_seqs.begin(); i != loss_seqs.end(); ++i)
diff --git a/srtcore/epoll.cpp b/srtcore/epoll.cpp
@@ -215,8 +215,8 @@ void srt::CEPoll::clear_ready_usocks(CEPollDesc& d, int direction)
         }
     }
 
-    for (size_t i = 0; i < cleared.size(); ++i)
-        d.removeSubscription(cleared[i]);
+    for (size_t j = 0; j < cleared.size(); ++j)
+        d.removeSubscription(cleared[j]);
 }
 
 int srt::CEPoll::add_ssock(const int eid, const SYSSOCKET& s, const int* events)

Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ int srt::CUDTUnited::newConnection(const SRTSOCKET listen,`
`674`	`674`	`// XXX this might require another check of group type.`
`675`	`675`	`// For redundancy group, at least, update the status in the group`
`676`	`676`	`CUDTGroup* g = ns->m_GroupOf;`
`677`		`- ScopedLock glock(g->m_GroupLock);`
	`677`	`+ ScopedLock grlock(g->m_GroupLock);`
`678`	`678`	`if (g->m_bClosing)`
`679`	`679`	`{`
`680`	`680`	`error = 1; // "INTERNAL REJECTION"`
Original file line number	Diff line number	Diff line change
`@@ -9726,8 +9726,6 @@ void srt::CUDT::processClose()`
`9726`	`9726`
`9727`	`9727`	`void srt::CUDT::sendLossReport(const std::vector<std::pair<int32_t, int32_t> > &loss_seqs)`
`9728`	`9728`	`{`
`9729`		`- typedef vector<pair<int32_t, int32_t> > loss_seqs_t;`
`9730`		`-`
`9731`	`9729`	`vector<int32_t> seqbuffer;`
`9732`	`9730`	`seqbuffer.reserve(2 * loss_seqs.size()); // pessimistic`
`9733`	`9731`	`for (loss_seqs_t::const_iterator i = loss_seqs.begin(); i != loss_seqs.end(); ++i)`
Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,8 @@ void srt::CEPoll::clear_ready_usocks(CEPollDesc& d, int direction)`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
`218`		`- for (size_t i = 0; i < cleared.size(); ++i)`
`219`		`- d.removeSubscription(cleared[i]);`
	`218`	`+ for (size_t j = 0; j < cleared.size(); ++j)`
	`219`	`+ d.removeSubscription(cleared[j]);`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`int srt::CEPoll::add_ssock(const int eid, const SYSSOCKET& s, const int* events)`