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, 2 insertions, 3 deletions

diff --git a/pcap.c b/pcap.c
index 29459de9..70c0f063 100644
--- a/pcap.c
+++ b/pcap.c
@@ -1922,12 +1922,11 @@ pcap_do_addexit(pcap_t *p)
 	 * "pcap_close_all()" called when we exit.
 	 */
 	if (!did_atexit) {
-		if (atexit(pcap_close_all) == -1) {
+		if (atexit(pcap_close_all) != 0) {
 			/*
 			 * "atexit()" failed; let our caller know.
 			 */
-			strncpy(p->errbuf, "atexit failed",
-			    PCAP_ERRBUF_SIZE);
+			strlcpy(p->errbuf, "atexit failed", PCAP_ERRBUF_SIZE);
 			return (0);
 		}
 		did_atexit = 1;