Fix variableScope (#985)

Author: egecetin

Common++/src/IpUtils.cpp

@@ -267,7 +267,7 @@ inet_pton6(const char* src, uint8_t* dst)
 	static const char xdigits_l[] = "0123456789abcdef",
 			  xdigits_u[] = "0123456789ABCDEF";
 	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
+	const char *curtok;
 	int ch, saw_xdigit;
 	u_int val;
 
@@ -283,7 +283,7 @@ inet_pton6(const char* src, uint8_t* dst)
 	val = 0;
 	while ((ch = *src++) != '\0')
 	{
-		const char* pch;
+		const char* pch, *xdigits;
 
 		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
 			pch = strchr((xdigits = xdigits_u), ch);

Examples/KniPong/main.cpp

@@ -522,7 +522,7 @@ void pingPongProcess(const LinuxSocket& sock)
 	size_t netbuffPos = 0;
 	unsigned char ttybuff[IO_BUFF_SIZE];
 	size_t ttybuffPos = 0;
-	int n, num_fds;
+	int n;
 	ssize_t ret;
 
 	/* stdin */
@@ -554,7 +554,7 @@ void pingPongProcess(const LinuxSocket& sock)
 			return;
 
 		/* poll */
-		num_fds = poll(pfd, 4, DEFAULT_POLL_TIMEOUT);
+		int num_fds = poll(pfd, 4, DEFAULT_POLL_TIMEOUT);
 
 		/* treat poll errors */
 		if (num_fds == -1)

Packet++/src/HttpLayer.cpp

@@ -793,7 +793,7 @@ int HttpResponseFirstLine::getStatusCodeAsInt() const
 std::string HttpResponseFirstLine::getStatusCodeString() const
 {
 	std::string result;
-	int statusStringOffset = 13;
+	const int statusStringOffset = 13;
 	if (m_StatusCode != HttpResponseLayer::HttpStatusCodeUnknown)
 	{
 		int statusStringEndOffset = m_FirstLineEndOffset - 2;

Packet++/src/Packet.cpp

@@ -691,9 +691,10 @@ std::string Packet::printPacketInfo(bool timeAsLocalTime) const
 		nowtm = gmtime(&nowtime);
 #endif
 
-	char tmbuf[64], buf[128];
+	char buf[128];
 	if (nowtm != NULL)
 	{
+		char tmbuf[64];
 		strftime(tmbuf, sizeof(tmbuf), "%Y-%m-%d %H:%M:%S", nowtm);
 		snprintf(buf, sizeof(buf), "%s.%09lu", tmbuf, (unsigned long)timestamp.tv_nsec);
 	}

Packet++/src/SipLayer.cpp

@@ -753,7 +753,7 @@ int SipResponseFirstLine::getStatusCodeAsInt() const
 std::string SipResponseFirstLine::getStatusCodeString() const
 {
 	std::string result;
-	int statusStringOffset = 12;
+	const int statusStringOffset = 12;
 	if (m_StatusCode != SipResponseLayer::SipStatusCodeUnknown)
 	{
 		int statusStringEndOffset = m_FirstLineEndOffset - 2;

Packet++/src/TelnetLayer.cpp

@@ -147,11 +147,10 @@ size_t TelnetLayer::getTotalNumberOfCommands()
 	if (isCommandField(m_Data))
 		++ctr;
 
-	size_t offset = 0;
 	uint8_t *pos = m_Data;
 	while (pos != NULL)
 	{
-		offset = pos - m_Data;
+		size_t offset = pos - m_Data;
 		pos = getNextCommandField(pos, m_DataLen - offset);
 		if (pos)
 			++ctr;
@@ -169,11 +168,10 @@ size_t TelnetLayer::getNumberOfCommands(TelnetCommand command)
 	if (isCommandField(m_Data) && m_Data[1] == command)
 		++ctr;
 
-	size_t offset = 0;
 	uint8_t *pos = m_Data;
 	while (pos != NULL)
 	{
-		offset = pos - m_Data;
+		size_t offset = pos - m_Data;
 		pos = getNextCommandField(pos, m_DataLen - offset);
 		if (pos && pos[1] == command)
 			++ctr;
@@ -235,10 +233,9 @@ TelnetLayer::TelnetOption TelnetLayer::getOption(TelnetCommand command)
 		return static_cast<TelnetOption>(getSubCommand(m_Data, getFieldLen(m_Data, m_DataLen)));
 
 	uint8_t *pos = m_Data;
-	size_t offset = 0;
 	while (pos != NULL)
 	{
-		offset = pos - m_Data;
+		size_t offset = pos - m_Data;
 		pos = getNextCommandField(pos, m_DataLen - offset);
 
 		if (pos && pos[1] == command)
@@ -282,10 +279,9 @@ uint8_t *TelnetLayer::getOptionData(TelnetCommand command, size_t &length)
 	}
 
 	uint8_t *pos = m_Data;
-	size_t offset = 0;
 	while (pos != NULL)
 	{
-		offset = pos - m_Data;
+		size_t offset = pos - m_Data;
 		pos = getNextCommandField(pos, m_DataLen - offset);
 
 		if (pos && pos[1] == command)

Pcap++/src/PcapLiveDevice.cpp

@@ -474,7 +474,7 @@ int PcapLiveDevice::startCaptureBlockingMode(OnPacketArrivesStopBlocking onPacke
 	long startTimeSec = 0, startTimeNSec = 0;
 	clockGetTime(startTimeSec, startTimeNSec);
 
-	long curTimeSec = 0, curTimeNSec = 0;
+	long curTimeSec = 0;
 
 	m_CaptureThreadStarted = true;
 	m_StopThread = false;
@@ -491,6 +491,7 @@ int PcapLiveDevice::startCaptureBlockingMode(OnPacketArrivesStopBlocking onPacke
 	{
 		while (!m_StopThread && curTimeSec <= (startTimeSec + timeout))
 		{
+			long curTimeNSec = 0;
 			pcap_dispatch(m_PcapDescriptor, -1, onPacketArrivesBlockingMode, (uint8_t*)this);
 			clockGetTime(curTimeSec, curTimeNSec);
 		}

Tests/Pcap++Test/Tests/KniTests.cpp

@@ -116,7 +116,6 @@ PTF_TEST_CASE(TestKniDevice)
 
 	// Assume that DPDK was initialized correctly in DpdkDevice tests
 	uint16_t KNI_TEST_MTU = 1540;
-	uint16_t KNI_NEW_MTU = 1500;
 	bool isLinkUp = true;
 	pcpp::KniDevice* device = NULL;
 	pcpp::KniDevice::KniDeviceConfiguration devConfig;
@@ -202,6 +201,7 @@ PTF_TEST_CASE(TestKniDevice)
 	}
 	if (pcpp::KniDeviceList::isCallbackSupported(pcpp::KniDeviceList::CALLBACK_MTU))
 	{
+		uint16_t KNI_NEW_MTU = 1500;
 		bool mtuSet = device->setMtu(KNI_NEW_MTU);
 		PTF_NON_CRITICAL_TRUE(mtuSet);
 		if (mtuSet)