Update a few more references to WinPcap to mention Npcap as well.

[skip ci]

diff --git a/pcap-npf.c b/pcap-npf.c
index f434e66ba2e04fd488ceac74f690133a47aa05c4..4c0c5db8da8abac7c8bd3548163298121f948346 100644 (file)
--- a/pcap-npf.c
+++ b/pcap-npf.c
@@ -70,7 +70,7 @@ static int pcap_setnonblock_npf(pcap_t *, int);
 #define SWAPS(_X) ((_X & 0xff) << 8) | (_X >> 8)
 
 /*
- * Private data for capturing on WinPcap devices.
+ * Private data for capturing on WinPcap/Npcap devices.
  */
 struct pcap_win {
        ADAPTER *adapter;               /* the packet32 ADAPTER for the device */
@@ -2017,9 +2017,9 @@ static const char *pcap_lib_version_string;
  * tree.  Include version.h from that source tree to get the WinPcap/Npcap
  * version.
  *
- * XXX - it'd be nice if we could somehow generate the WinPcap version number
- * when building WinPcap.  (It'd be nice to do so for the packet.dll version
- * number as well.)
+ * XXX - it'd be nice if we could somehow generate the WinPcap/Npcap version
+ * number when building as part of WinPcap/Npcap.  (It'd be nice to do so
+ * for the packet.dll version number as well.)
  */
 #include "../../version.h"
 
@@ -2037,17 +2037,17 @@ pcap_lib_version(void)
 
                if (strcmp(WINPCAP_VER_STRING, packet_version_string) == 0) {
                        /*
-                        * WinPcap version string and packet.dll version
-                        * string are the same; just report the WinPcap
+                        * WinPcap/Npcap version string and packet.dll version
+                        * string are the same; just report the WinPcap/Npcap
                         * version.
                         */
                        pcap_lib_version_string = pcap_version_string;
                } else {
                        /*
-                        * WinPcap version string and packet.dll version
+                        * WinPcap/Npcap version string and packet.dll version
                         * string are different; that shouldn't be the
                         * case (the two libraries should come from the
-                        * same version of WinPcap), so we report both
+                        * same version of WinPcap/Npcap), so we report both
                         * versions.
                         */
                        char *full_pcap_version_string;

diff --git a/pcap.c b/pcap.c
index 0d985199e036691927939e152e4ab9bdb7e8cd13..ad06a871e69ecf7698ce1a92698febbe71752ee9 100644 (file)
--- a/pcap.c
+++ b/pcap.c
@@ -139,7 +139,7 @@ BOOL WINAPI DllMain(
 
 /*
  * Start WinSock.
- * Exported in case some applications using WinPcap called it,
+ * Exported in case some applications using WinPcap/Npcap called it,
  * even though it wasn't exported.
  */
 int

diff --git a/savefile.c b/savefile.c
index 7adee42ffb4d1387a52408042acf8c68265b8a26..d22e48c5952bb5f4130e49bd5d0e4c48635d3233 100644 (file)
--- a/savefile.c
+++ b/savefile.c
@@ -56,8 +56,8 @@
 #ifdef _WIN32
 /*
  * These aren't exported on Windows, because they would only work if both
- * WinPcap and the code using it were to use the Universal CRT; otherwise,
- * a FILE structure in WinPcap and a FILE structure in the code using it
+ * WinPcap/Npcap and the code using it were to use the Universal CRT; otherwise,
+ * a FILE structure in WinPcap/Npcap and a FILE structure in the code using it
  * could be different if they're using different versions of the C runtime.
  *
  * Instead, pcap/pcap.h defines them as macros that wrap the hopen versions,