Rename pcap_win32strerror() to pcap_win32_err_to_str().

The new name better reflects what it now does - take an error code and
convert it to a string.

Fix a couple of incorrect calls to it while we're at it.

diff --git a/fad-win32.c b/fad-win32.c
index 891c72c33b564266b1fe31d625b141b6c8fa0bbf..4f36ad2b93ad1d698a75fc21675062eaef6ebefb 100644 (file)
--- a/fad-win32.c
+++ b/fad-win32.c
@@ -153,7 +153,7 @@ pcap_findalldevs_interfaces(pcap_if_t **alldevsp, char *errbuf)
 
                if (last_error != ERROR_INSUFFICIENT_BUFFER)
                {
-                       pcap_win32strerror(last_error, our_errbuf);
+                       pcap_win32_err_to_str(last_error, our_errbuf);
                        snprintf(errbuf, PCAP_ERRBUF_SIZE,
                            "PacketGetAdapterNames: %s", our_errbuf);
                        return (-1);
@@ -174,7 +174,7 @@ pcap_findalldevs_interfaces(pcap_if_t **alldevsp, char *errbuf)
        }
 
        if (!PacketGetAdapterNames(AdaptersName, &NameLength)) {
-               pcap_win32strerror(GetLastError(), our_errbuf);
+               pcap_win32_err_to_str(GetLastError(), our_errbuf);
                snprintf(errbuf, PCAP_ERRBUF_SIZE, "PacketGetAdapterNames: %s",
                    our_errbuf);
                free(AdaptersName);

diff --git a/inet.c b/inet.c
index 7cd87ad19d0f75baee7c2eaf853249af17a03514..5d63a75e7e40f5d1a71ec1f26f3fcbcfc084ca21 100644 (file)
--- a/inet.c
+++ b/inet.c
@@ -985,6 +985,7 @@ pcap_lookupdev(errbuf)
        DWORD dwWindowsMajorVersion;
        dwVersion = GetVersion();       /* get the OS version */
        dwWindowsMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
+       char our_errbuf[PCAP_ERRBUF_SIZE+1];
 
        if (dwVersion >= 0x80000000 && dwWindowsMajorVersion >= 4) {
                /*
@@ -1016,9 +1017,9 @@ pcap_lookupdev(errbuf)
 
                if ( !PacketGetAdapterNames((PTSTR)TAdaptersName,&NameLength) )
                {
+                       pcap_win32_err_to_str(GetLastError(), our_errbuf);
                        (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
-                               "PacketGetAdapterNames: %s",
-                               pcap_win32strerror());
+                               "PacketGetAdapterNames: %s", our_errbuf);
                        free(TAdaptersName);
                        return NULL;
                }

diff --git a/pcap-int.h b/pcap-int.h
index a66b934e3968d0c07d950c46ef734a5d31630ec6..a113482a606c65798a438a0a1573b2962087edd9 100644 (file)
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -449,7 +449,7 @@ void        sf_cleanup(pcap_t *p);
 void   pcap_oneshot(u_char *, const struct pcap_pkthdr *, const u_char *);
 
 #ifdef _WIN32
-void   pcap_win32strerror(DWORD, char *);
+void   pcap_win32_err_to_str(DWORD, char *);
 #endif
 
 int    install_bpf_program(pcap_t *, struct bpf_program *);

diff --git a/pcap-win32.c b/pcap-win32.c
index 7eeb3df3d10d28e9dd16e8ff8c2cf71f45f5d93c..aa634488441259d1668a099fee079b774c0be443 100644 (file)
--- a/pcap-win32.c
+++ b/pcap-win32.c
@@ -146,7 +146,7 @@ pcap_stats_win32(pcap_t *p, struct pcap_stat *ps)
         * to us.
         */
        if (!PacketGetStats(p->adapter, &bstats)) {
-               pcap_win32strerror(GetLastError(), errbuf);
+               pcap_win32_err_to_str(GetLastError(), errbuf);
                snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
                    "PacketGetStats error: %s", errbuf);
                return -1;
@@ -204,7 +204,7 @@ pcap_stats_ex(pcap_t *p, int *pcap_stat_size)
         * same layout, but let's not cheat.)
         */
        if (!PacketGetStatsEx(p->adapter, &bstats)) {
-               pcap_win32strerror(GetLastError(), errbuf);
+               pcap_win32_err_to_str(GetLastError(), errbuf);
                snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
                    "PacketGetStatsEx error: %s", errbuf);
                return NULL;
@@ -596,7 +596,7 @@ pcap_activate_win32(pcap_t *p)
        if (p->adapter == NULL)
        {
                /* Adapter detected but we are not able to open it. Return failure. */
-               pcap_win32strerror(GetLastError(), errbuf);
+               pcap_win32_err_to_str(GetLastError(), errbuf);
                snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
                    "Error opening adapter: %s", errbuf);
                return PCAP_ERROR;
@@ -605,7 +605,7 @@ pcap_activate_win32(pcap_t *p)
        /*get network type*/
        if(PacketGetNetType (p->adapter,&type) == FALSE)
        {
-               pcap_win32strerror(GetLastError(), errbuf);
+               pcap_win32_err_to_str(GetLastError(), errbuf);
                snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
                    "Cannot determine the network type: %s", errbuf);
                goto bad;
@@ -751,7 +751,7 @@ pcap_activate_win32(pcap_t *p)
                        /* tell the driver to copy the buffer as soon as data arrives */
                        if(PacketSetMinToCopy(p->adapter,0)==FALSE)
                        {
-                               pcap_win32strerror(GetLastError(), errbuf);
+                               pcap_win32_err_to_str(GetLastError(), errbuf);
                                snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
                                    "Error calling PacketSetMinToCopy: %s",
                                    errbuf);
@@ -763,7 +763,7 @@ pcap_activate_win32(pcap_t *p)
                        /* tell the driver to copy the buffer only if it contains at least 16K */
                        if(PacketSetMinToCopy(p->adapter,16000)==FALSE)
                        {
-                               pcap_win32strerror(GetLastError(), errbuf);
+                               pcap_win32_err_to_str(GetLastError(), errbuf);
                                snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
                                    "Error calling PacketSetMinToCopy: %s",
                                    errbuf);
@@ -1016,7 +1016,7 @@ pcap_setnonblock_win32(pcap_t *p, int nonblock, char *errbuf)
                newtimeout = p->opt.timeout;
        }
        if (!PacketSetReadTimeout(p->adapter, newtimeout)) {
-               pcap_win32strerror(GetLastError(), errbuf);
+               pcap_win32_err_to_str(GetLastError(), errbuf);
                snprintf(errbuf, PCAP_ERRBUF_SIZE,
                    "PacketSetReadTimeout: %s", errbuf);
                return (-1);
@@ -1059,7 +1059,7 @@ pcap_oid_get_request(pcap_t *p, pcap_oid_data_t *data)
        char errbuf[PCAP_ERRBUF_SIZE+1];
 
        if (!PacketRequest(p->adapter, FALSE, data)) {
-               pcap_win32strerror(errbuf);
+               pcap_win32_err_to_str(GetLastError(), errbuf);
                snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
                    "Error calling PacketRequest: %s", errbuf);
                return PCAP_ERROR;
@@ -1073,7 +1073,7 @@ pcap_oid_set_request(pcap_t *p, pcap_oid_data_t *data)
        char errbuf[PCAP_ERRBUF_SIZE+1];
 
        if (!PacketRequest(p->adapter, TRUE, data)) {
-               pcap_win32strerror(GetLastError(), errbuf);
+               pcap_win32_err_to_str(GetLastError(), errbuf);
                snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
                    "Error calling PacketRequest: %s", errbuf);
                return PCAP_ERROR;
@@ -1150,7 +1150,7 @@ pcap_sendqueue_transmit(pcap_t *p, pcap_send_queue* queue, int sync)
                (BOOLEAN)sync);
 
        if(res != queue->len){
-               pcap_win32strerror(GetLastError(), errbuf);
+               pcap_win32_err_to_str(GetLastError(), errbuf);
                snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
                    "Error opening adapter: %s", errbuf);
        }

diff --git a/pcap.c b/pcap.c
index 09c2f2a2fbeb30773bd51a857090ff8c131956e4..4392378c720e42c6553d385cbf49a5272590e524 100644 (file)
--- a/pcap.c
+++ b/pcap.c
@@ -1493,7 +1493,7 @@ pcap_setnonblock_fd(pcap_t *p, int nonblock, char *errbuf)
  * For errors occurred during standard C calls, we still use pcap_strerror()
  */
 void
-pcap_win32strerror(DWORD error, char *errbuf)
+pcap_win32_err_to_str(DWORD error, char *errbuf)
 {
        DWORD error;
        int errlen;