diff options
| author | hrs <hrs@FreeBSD.org> | 2011-05-29 02:53:52 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2011-05-29 02:53:52 +0000 |
| commit | 8fe640108653f13042f1b15213769e338aa524f6 (patch) | |
| tree | 91f5675a7c792e61d68635707501027daa3f566f /lib/libc/net/getprotoent.c | |
| parent | 97f64b711efa9ff0011bef5d46cf9645638a38f9 (diff) | |
| parent | f3726238c8e8206eb1df4cfaf3f00947ceba3cce (diff) | |
| download | FreeBSD-src-8fe640108653f13042f1b15213769e338aa524f6.zip FreeBSD-src-8fe640108653f13042f1b15213769e338aa524f6.tar.gz | |
Merge from head@222434.
Diffstat (limited to 'lib/libc/net/getprotoent.c')
| -rw-r--r-- | lib/libc/net/getprotoent.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/libc/net/getprotoent.c b/lib/libc/net/getprotoent.c index dda5d18..0cfca45 100644 --- a/lib/libc/net/getprotoent.c +++ b/lib/libc/net/getprotoent.c @@ -424,8 +424,10 @@ files_getprotoent_r(void *retval, void *mdata, va_list ap) buflen = va_arg(ap, size_t); errnop = va_arg(ap, int *); - if ((ped = __protoent_data_init()) == NULL) - return (-1); + if ((ped = __protoent_data_init()) == NULL) { + *errnop = errno; + return (NS_NOTFOUND); + } if (__getprotoent_p(&pe, ped) != 0) { *errnop = errno; @@ -434,7 +436,7 @@ files_getprotoent_r(void *retval, void *mdata, va_list ap) if (__copy_protoent(&pe, pptr, buffer, buflen) != 0) { *errnop = errno; - return (NS_NOTFOUND); + return (NS_RETURN); } *((struct protoent **)retval) = pptr; @@ -490,10 +492,11 @@ getprotoent_r(struct protoent *pptr, char *buffer, size_t buflen, rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotoent_r", defaultsrc, pptr, buffer, buflen, &ret_errno); - if (rv == NS_SUCCESS) - return (0); - else + if (rv != NS_SUCCESS) { + errno = ret_errno; return (ret_errno); + } + return (0); } void |
