Remove unused includes (seladb#1604)

* Remove unused includes * Fix * Add back `cstring` where needed * Remove unused includes from examples and tutorials * Add `cstdlib` * Remove unused includes for DPDK * Remove unused includes for PF_RING * Remove one more unused include for PF_RING
fxlb · Oct 22, 2024 · 1fea957 · 1fea957
1 parent 2c8232d
commit 1fea957
Show file tree

Hide file tree

Showing 91 changed files with 20 additions and 160 deletions.
diff --git a/Common++/src/GeneralUtils.cpp b/Common++/src/GeneralUtils.cpp
@@ -4,8 +4,7 @@
 #include "Logger.h"
 #include <sstream>
 #include <iomanip>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
 
 namespace pcpp
 {

diff --git a/Common++/src/IpAddress.cpp b/Common++/src/IpAddress.cpp
@@ -1,11 +1,8 @@
 #define LOG_MODULE CommonLogModuleIpUtils
 
 #include <algorithm>
-#include <cmath>
-#include <errno.h>
 #include <sstream>
 #include <stdexcept>
-#include <stdint.h>
 #include <bitset>
 #include "Logger.h"
 #include "IpUtils.h"

diff --git a/Common++/src/IpUtils.cpp b/Common++/src/IpUtils.cpp
@@ -2,8 +2,7 @@
 
 #include "IpUtils.h"
 #include "Logger.h"
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
 #include <stdexcept>
 #ifndef NS_INADDRSZ
 #	define NS_INADDRSZ 4

diff --git a/Common++/src/MacAddress.cpp b/Common++/src/MacAddress.cpp
@@ -1,5 +1,3 @@
-#include <stdio.h>
-
 #include "MacAddress.h"
 
 namespace pcpp

diff --git a/Common++/src/SystemUtils.cpp b/Common++/src/SystemUtils.cpp
@@ -9,9 +9,8 @@
 #include <array>
 #include <iostream>
 #include <mutex>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstring>
+#include <csignal>
 #include <sys/stat.h>
 #if defined(__APPLE__)
 #	include <mach/clock.h>

diff --git a/Common++/src/TablePrinter.cpp b/Common++/src/TablePrinter.cpp
@@ -3,7 +3,6 @@
 #include <iomanip>
 #include <sstream>
 #include <iostream>
-#include <iterator>
 #include <numeric>
 #include <utility>
 #include "TablePrinter.h"

diff --git a/Examples/ArpSpoofing/main.cpp b/Examples/ArpSpoofing/main.cpp
@@ -1,8 +1,5 @@
-#include <stdio.h>
-#include <stdlib.h>
 #include <iostream>
 #include <fstream>
-#include <memory>
 #include <MacAddress.h>
 #include <IpAddress.h>
 #include <PcapPlusPlusVersion.h>
@@ -11,7 +8,6 @@
 #include <PcapLiveDevice.h>
 #include <EthLayer.h>
 #include <ArpLayer.h>
-#include <Logger.h>
 #include <getopt.h>
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \

diff --git a/Examples/Arping/main.cpp b/Examples/Arping/main.cpp
@@ -5,7 +5,6 @@
  * response. Its basic input is the target IP address and the interface name/IP to send the ARP request from
  */
 
-#include <stdlib.h>
 #include <iostream>
 #include <MacAddress.h>
 #include <IpAddress.h>

diff --git a/Examples/DNSResolver/main.cpp b/Examples/DNSResolver/main.cpp
@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include <iostream>
 #include "PcapPlusPlusVersion.h"
 #include "PcapLiveDevice.h"

diff --git a/Examples/DpdkBridge/Common.h b/Examples/DpdkBridge/Common.h
@@ -11,7 +11,6 @@
 #include <iomanip>
 #include <iostream>
 #include <sstream>
-#include <stdlib.h>
 
 /**
  * Macros for exiting the application with error

diff --git a/Examples/DpdkBridge/main.cpp b/Examples/DpdkBridge/main.cpp
@@ -24,18 +24,12 @@
 #include "AppWorkerThread.h"
 
 #include "DpdkDeviceList.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
 #include "SystemUtils.h"
 #include "PcapPlusPlusVersion.h"
 #include "TablePrinter.h"
 
 #include <vector>
 #include <iostream>
-#include <iomanip>
-#include <stdlib.h>
-#include <signal.h>
 #include <getopt.h>
 #include <string>
 #include <sstream>

diff --git a/Examples/DpdkExample-FilterTraffic/Common.h b/Examples/DpdkExample-FilterTraffic/Common.h
@@ -11,7 +11,6 @@
 #include <iomanip>
 #include <iostream>
 #include <sstream>
-#include <stdlib.h>
 
 /**
  * Macros for exiting the application with error

diff --git a/Examples/DpdkExample-FilterTraffic/main.cpp b/Examples/DpdkExample-FilterTraffic/main.cpp
@@ -33,7 +33,6 @@
 
 #include <vector>
 #include <iostream>
-#include <stdlib.h>
 #include <getopt.h>
 #include <string>
 #include <sstream>

diff --git a/Examples/HttpAnalyzer/main.cpp b/Examples/HttpAnalyzer/main.cpp
@@ -17,8 +17,6 @@
  * For more details about modes of operation and parameters run HttpAnalyzer -h
  */
 
-#include <stdlib.h>
-#include <string.h>
 #include <iomanip>
 #include <algorithm>
 #include "PcapLiveDeviceList.h"

diff --git a/Examples/IPDefragUtil/main.cpp b/Examples/IPDefragUtil/main.cpp
@@ -1,8 +1,7 @@
 #include <iostream>
 #include <unordered_map>
 #include <sstream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include "PcapPlusPlusVersion.h"
 #include "IPv4Layer.h"
 #include "IPv6Layer.h"

diff --git a/Examples/IPFragUtil/main.cpp b/Examples/IPFragUtil/main.cpp
@@ -1,9 +1,8 @@
 #include <iostream>
 #include <unordered_map>
 #include <sstream>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <cstring>
+#include <cmath>
 #include "PcapPlusPlusVersion.h"
 #include "Packet.h"
 #include "IPv4Layer.h"

diff --git a/Examples/IcmpFileTransfer/Common.cpp b/Examples/IcmpFileTransfer/Common.cpp
@@ -1,5 +1,4 @@
 #include "Common.h"
-#include <stdlib.h>
 #include <iostream>
 #include <vector>
 #include <getopt.h>

diff --git a/Examples/IcmpFileTransfer/IcmpFileTransfer-catcher.cpp b/Examples/IcmpFileTransfer/IcmpFileTransfer-catcher.cpp
@@ -6,7 +6,6 @@
  * For more information please refer to README.md
  */
 
-#include <stdlib.h>
 #include <iostream>
 #include <fstream>
 #include "EthLayer.h"

diff --git a/Examples/IcmpFileTransfer/IcmpFileTransfer-pitcher.cpp b/Examples/IcmpFileTransfer/IcmpFileTransfer-pitcher.cpp
@@ -6,7 +6,6 @@
  * For more information please refer to README.md
  */
 
-#include <stdlib.h>
 #include <stdexcept>
 #include <iostream>
 #include <fstream>

diff --git a/Examples/PcapPrinter/main.cpp b/Examples/PcapPrinter/main.cpp
@@ -10,7 +10,6 @@
  * For more details about modes of operation and parameters run PcapPrinter -h
  */
 
-#include <stdlib.h>
 #include <iostream>
 #include <fstream>
 #include <sstream>

diff --git a/Examples/PcapSearch/main.cpp b/Examples/PcapSearch/main.cpp
@@ -29,7 +29,6 @@
  * For more details about modes of operation and parameters please run PcapSearch -h
  */
 
-#include <stdlib.h>
 #include <iostream>
 #include <fstream>
 #include <sstream>

diff --git a/Examples/PcapSplitter/main.cpp b/Examples/PcapSplitter/main.cpp
@@ -44,12 +44,8 @@
  *
  */
 
-#include <stdlib.h>
 #include <iostream>
-#include <fstream>
-#include <sstream>
 #include <string>
-#include <iomanip>
 #include <unordered_map>
 #include <RawPacket.h>
 #include <Packet.h>

diff --git a/Examples/PfRingExample-FilterTraffic/Common.h b/Examples/PfRingExample-FilterTraffic/Common.h
@@ -2,15 +2,7 @@
 
 #include <Packet.h>
 #include <PfRingDeviceList.h>
-
-#include <SystemUtils.h>
-
-#include <string>
-#include <vector>
-#include <iomanip>
-#include <iostream>
 #include <sstream>
-#include <stdlib.h>
 
 /**
  * Macros for exiting the application with error

diff --git a/Examples/PfRingExample-FilterTraffic/PacketMatchingEngine.h b/Examples/PfRingExample-FilterTraffic/PacketMatchingEngine.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "SystemUtils.h"
 #include "Packet.h"
 #include "IPv4Layer.h"
 #include "TcpLayer.h"

diff --git a/Examples/PfRingExample-FilterTraffic/main.cpp b/Examples/PfRingExample-FilterTraffic/main.cpp
@@ -32,15 +32,11 @@
 
 #include "Common.h"
 #include "PacketMatchingEngine.h"
-#include <PfRingDeviceList.h>
 #include <PcapFileDevice.h>
 #include <PacketUtils.h>
-#include <SystemUtils.h>
 #include <PcapPlusPlusVersion.h>
 #include <TablePrinter.h>
 #include <Logger.h>
-#include <stdlib.h>
-#include <vector>
 #include <getopt.h>
 #include <unordered_map>
 #include <sstream>

diff --git a/Examples/SSLAnalyzer/main.cpp b/Examples/SSLAnalyzer/main.cpp
@@ -17,8 +17,6 @@
  * For more details about modes of operation and parameters run SSLAnalyzer -h
  */
 
-#include <stdlib.h>
-#include <string.h>
 #include <iostream>
 #include <iomanip>
 #include <algorithm>

diff --git a/Examples/TcpReassembly/main.cpp b/Examples/TcpReassembly/main.cpp
@@ -22,7 +22,6 @@
  * For more details about modes of operation and parameters run TcpReassembly -h
  */
 
-#include <stdlib.h>
 #include <unordered_map>
 #include <iostream>
 #include <fstream>

diff --git a/Examples/Tutorials/Tutorial-LiveTraffic/main.cpp b/Examples/Tutorials/Tutorial-LiveTraffic/main.cpp
@@ -1,6 +1,5 @@
 #include <iostream>
 #include <algorithm>
-#include "stdlib.h"
 #include "PcapLiveDeviceList.h"
 #include "SystemUtils.h"
 /**

diff --git a/Examples/Tutorials/Tutorial-PacketCraftAndEdit/main.cpp b/Examples/Tutorials/Tutorial-PacketCraftAndEdit/main.cpp
@@ -1,6 +1,5 @@
 #include <iostream>
 #include <memory>
-#include "stdlib.h"
 #include "SystemUtils.h"
 #include "Packet.h"
 #include "EthLayer.h"

diff --git a/Examples/Tutorials/Tutorial-PacketParsing/main.cpp b/Examples/Tutorials/Tutorial-PacketParsing/main.cpp
@@ -1,6 +1,5 @@
 #include <iostream>
 #include <memory>
-#include "stdlib.h"
 #include "SystemUtils.h"
 #include "Packet.h"
 #include "EthLayer.h"

diff --git a/Examples/Tutorials/Tutorial-PcapFiles/main.cpp b/Examples/Tutorials/Tutorial-PcapFiles/main.cpp
@@ -1,6 +1,5 @@
 #include <memory>
 #include <iostream>
-#include "stdlib.h"
 #include "PcapFileDevice.h"
 
 /**

diff --git a/Packet++/src/ArpLayer.cpp b/Packet++/src/ArpLayer.cpp
@@ -2,7 +2,6 @@
 
 #include "ArpLayer.h"
 #include "EthLayer.h"
-#include <string.h>
 #include "EndianPortable.h"
 
 namespace pcpp

diff --git a/Packet++/src/Asn1Codec.cpp b/Packet++/src/Asn1Codec.cpp
@@ -3,15 +3,14 @@
 #include "Asn1Codec.h"
 #include "GeneralUtils.h"
 #include "EndianPortable.h"
-#include "GeneralUtils.h"
 #include <unordered_map>
 #include <numeric>
 #include <algorithm>
 #include <iostream>
 #include <sstream>
-#include <cstring>
 #include <cmath>
 #include <limits>
+#include <cstring>
 
 #if defined(_WIN32)
 #	undef max

diff --git a/Packet++/src/BgpLayer.cpp b/Packet++/src/BgpLayer.cpp
@@ -1,6 +1,5 @@
 #define LOG_MODULE PacketLogModuleBgpLayer
 
-#include <string.h>
 #include "Logger.h"
 #include "BgpLayer.h"
 #include "EndianPortable.h"

diff --git a/Packet++/src/CotpLayer.cpp b/Packet++/src/CotpLayer.cpp
@@ -1,10 +1,6 @@
 #include "../header/CotpLayer.h"
-#include "EndianPortable.h"
 #include "S7CommLayer.h"
 #include <PayloadLayer.h>
-#include <cstring>
-#include <iostream>
-#include <sstream>
 
 namespace pcpp
 {

diff --git a/Packet++/src/DnsLayer.cpp b/Packet++/src/DnsLayer.cpp
@@ -2,11 +2,7 @@
 
 #include "DnsLayer.h"
 #include "Logger.h"
-#include "IpAddress.h"
 #include <sstream>
-#include <string.h>
-#include <iomanip>
-#include <stdlib.h>
 #include "EndianPortable.h"
 
 namespace pcpp

diff --git a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp
@@ -3,7 +3,6 @@
 #include "DnsResource.h"
 #include "Logger.h"
 #include <sstream>
-#include <string.h>
 #include "EndianPortable.h"
 
 namespace pcpp

diff --git a/Packet++/src/DnsResourceData.cpp b/Packet++/src/DnsResourceData.cpp
@@ -5,7 +5,6 @@
 #include "GeneralUtils.h"
 #include <sstream>
 #include <utility>
-#include <string.h>
 #include "EndianPortable.h"
 
 namespace pcpp

diff --git a/Packet++/src/EthLayer.cpp b/Packet++/src/EthLayer.cpp
@@ -10,7 +10,6 @@
 #include "MplsLayer.h"
 #include "WakeOnLanLayer.h"
 #include "EndianPortable.h"
-#include <string.h>
 
 namespace pcpp
 {

diff --git a/Packet++/src/HttpLayer.cpp b/Packet++/src/HttpLayer.cpp
@@ -3,11 +3,9 @@
 #include "Logger.h"
 #include "GeneralUtils.h"
 #include "HttpLayer.h"
-#include <string.h>
+#include <cstring>
 #include <algorithm>
-#include <stdlib.h>
 #include <exception>
-#include <utility>
 #include <unordered_map>
 
 namespace pcpp

diff --git a/Packet++/src/IPReassembly.cpp b/Packet++/src/IPReassembly.cpp
@@ -5,7 +5,6 @@
 #include "IPv6Layer.h"
 #include "PacketUtils.h"
 #include "Logger.h"
-#include <string.h>
 #include "EndianPortable.h"
 
 namespace pcpp