diff options
Diffstat (limited to 'freebsd/lib/libc/net/getservent.c')
| -rw-r--r-- | freebsd/lib/libc/net/getservent.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/freebsd/lib/libc/net/getservent.c b/freebsd/lib/libc/net/getservent.c index aff91ed2..63aba518 100644 --- a/freebsd/lib/libc/net/getservent.c +++ b/freebsd/lib/libc/net/getservent.c @@ -36,7 +36,6 @@ static char sccsid[] = "@(#)getservent.c 8.1 (Berkeley) 6/4/93"; __FBSDID("$FreeBSD$"); #include <rtems/bsd/sys/param.h> -#include <sys/types.h> #include <sys/socket.h> #include <arpa/inet.h> #include <db.h> @@ -323,7 +322,7 @@ files_servent(void *retval, void *mdata, va_list ap) break; default: return NS_NOTFOUND; - }; + } serv = va_arg(ap, struct servent *); buffer = va_arg(ap, char *); @@ -337,7 +336,7 @@ files_servent(void *retval, void *mdata, va_list ap) if (st->fp == NULL) st->compat_mode_active = 0; - if (st->fp == NULL && (st->fp = fopen(_PATH_SERVICES, "r")) == NULL) { + if (st->fp == NULL && (st->fp = fopen(_PATH_SERVICES, "re")) == NULL) { *errnop = errno; return (NS_UNAVAIL); } @@ -408,14 +407,14 @@ files_servent(void *retval, void *mdata, va_list ap) continue; gotname: - if (proto == 0 || strcmp(serv->s_proto, proto) == 0) + if (proto == NULL || strcmp(serv->s_proto, proto) == 0) rv = NS_SUCCESS; break; case nss_lt_id: if (port != serv->s_port) continue; - if (proto == 0 || strcmp(serv->s_proto, proto) == 0) + if (proto == NULL || strcmp(serv->s_proto, proto) == 0) rv = NS_SUCCESS; break; case nss_lt_all: @@ -451,7 +450,7 @@ files_setservent(void *retval, void *mdata, va_list ap) case SETSERVENT: f = va_arg(ap,int); if (st->fp == NULL) - st->fp = fopen(_PATH_SERVICES, "r"); + st->fp = fopen(_PATH_SERVICES, "re"); else rewind(st->fp); st->stayopen |= f; @@ -465,7 +464,7 @@ files_setservent(void *retval, void *mdata, va_list ap) break; default: break; - }; + } st->compat_mode_active = 0; return (NS_UNAVAIL); @@ -524,7 +523,7 @@ db_servent(void *retval, void *mdata, va_list ap) break; default: return NS_NOTFOUND; - }; + } serv = va_arg(ap, struct servent *); buffer = va_arg(ap, char *); @@ -643,7 +642,7 @@ db_setservent(void *retval, void *mdata, va_list ap) break; default: break; - }; + } return (NS_UNAVAIL); } @@ -696,7 +695,7 @@ nis_servent(void *retval, void *mdata, va_list ap) break; default: return NS_NOTFOUND; - }; + } serv = va_arg(ap, struct servent *); buffer = va_arg(ap, char *); @@ -783,7 +782,7 @@ nis_servent(void *retval, void *mdata, va_list ap) } } break; - }; + } rv = parse_result(serv, buffer, bufsize, resultbuf, resultbuflen, errnop); @@ -817,7 +816,7 @@ nis_setservent(void *result, void *mdata, va_list ap) break; default: break; - }; + } return (NS_UNAVAIL); } @@ -1243,7 +1242,7 @@ setservent(int stayopen) } void -endservent() +endservent(void) { #ifdef NS_CACHING static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( @@ -1364,7 +1363,7 @@ getservbyport(int port, const char *proto) } struct servent * -getservent() +getservent(void) { struct key key; |