Clean up pcap_do_addexit() and calls to it.

atexit() is only specified in standards as returning "a non-zero value"
on error; don't assume it returns -1, even if it's documented as doing
so on some platforms.

pcap_do_addexit() already fills in p->errbuf; don't do so in its callers.

1 files changed, 0 insertions, 4 deletions

diff --git a/pcap-bpf.c b/pcap-bpf.c
index 92c859f5..f49adaf6 100644
--- a/pcap-bpf.c
+++ b/pcap-bpf.c
@@ -1752,8 +1752,6 @@ pcap_activate_bpf(pcap_t *p)
 				 * "atexit()" failed; don't create the
 				 * interface, just give up.
 				 */
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				     "atexit failed");
 				close(s);
 				status = PCAP_ERROR;
 				goto bad;
@@ -2625,8 +2623,6 @@ monitor_mode(pcap_t *p, int set)
 				 * "atexit()" failed; don't put the interface
 				 * in monitor mode, just give up.
 				 */
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				     "atexit failed");
 				close(sock);
 				return (PCAP_ERROR);
 			}