Skip to content

Commit

Permalink
Hurd: Replace pcap_strerror() completely. [skip ci]
Browse files Browse the repository at this point in the history
GNU/Hurd, rather logically, implements GNU strerror_r(), so let
pcapint_fmt_errmsg_for_errno() make the necessary moves.
  • Loading branch information
infrastation committed Feb 14, 2024
1 parent f5f1a72 commit 3b0edbc
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions pcap-hurd.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ pcap_read_hurd(pcap_t *p, int cnt _U_, pcap_handler callback, u_char *user)
if (kr == MACH_RCV_INTERRUPTED)
goto retry;

snprintf(p->errbuf, sizeof(p->errbuf), "mach_msg: %s",
pcap_strerror(kr));
pcapint_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE, kr,
"mach_msg");
return PCAP_ERROR;
}

Expand Down Expand Up @@ -203,8 +203,8 @@ pcap_inject_hurd(pcap_t *p, const void *buf, int size)
(io_buf_ptr_t)buf, size, &count);

if (kr) {
snprintf(p->errbuf, sizeof(p->errbuf), "device_write: %s",
pcap_strerror(kr));
pcapint_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE, kr,
"device_write");
return -1;
}

Expand Down Expand Up @@ -264,8 +264,8 @@ pcap_activate_hurd(pcap_t *p)
kr = get_privileged_ports(NULL, &master);

if (kr) {
snprintf(p->errbuf, sizeof(p->errbuf),
"get_privileged_ports: %s", pcap_strerror(kr));
pcapint_fmt_errmsg_for_errno(p->errbuf,
PCAP_ERRBUF_SIZE, kr, "get_privileged_ports");
if (kr == EPERM)
ret = PCAP_ERROR_PERM_DENIED;
goto error;
Expand All @@ -278,8 +278,8 @@ pcap_activate_hurd(pcap_t *p)
mach_port_deallocate(mach_task_self(), master);

if (kr) {
snprintf(p->errbuf, sizeof(p->errbuf), "device_open: %s",
pcap_strerror(kr));
pcapint_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE, kr,
"device_open");
if (kr == ED_NO_SUCH_DEVICE) /* not ENODEV */
ret = PCAP_ERROR_NO_SUCH_DEVICE;
goto error;
Expand All @@ -289,17 +289,17 @@ pcap_activate_hurd(pcap_t *p)
&ph->rcv_port);

if (kr) {
snprintf(p->errbuf, sizeof(p->errbuf), "mach_port_allocate: %s",
pcap_strerror(kr));
pcapint_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE, kr,
"mach_port_allocate");
goto error;
}

p->bufsize = sizeof(struct net_rcv_msg);
p->buffer = malloc(p->bufsize);

if (p->buffer == NULL) {
snprintf(p->errbuf, sizeof(p->errbuf), "malloc: %s",
pcap_strerror(errno));
pcapint_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
errno, "malloc");
goto error;
}

Expand Down

0 comments on commit 3b0edbc

Please sign in to comment.