X-Git-Url: http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu%2Fglibc.git;a=blobdiff_plain;f=nss%2FgetXXent_r.c;h=f2cca259f085e25467ce00f296058db34b74f3f2;hp=876ad10963fe8f6309d1c5dd5402c05aafdfc62a;hb=58c347a266d70ee7b080818318fed645a01a4532;hpb=ddad19fedc01570921e46bd2bb5db39683cb4f01 diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c index 876ad10963..f2cca259f0 100644 --- a/nss/getXXent_r.c +++ b/nss/getXXent_r.c @@ -17,7 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include +#include #include "nsswitch.h" @@ -124,9 +124,9 @@ setup (void **fctp, const char *func_name, int all) if (startp == NULL) { no_more = DB_LOOKUP_FCT (&nip, func_name, fctp); - startp = no_more ? (service_user *) -1 : nip; + startp = no_more ? (service_user *) -1l : nip; } - else if (startp == (service_user *) -1) + else if (startp == (service_user *) -1l) /* No services at all. */ return 1; else @@ -150,7 +150,7 @@ SETFUNC_NAME (STAYOPEN) if ((_res.options & RES_INIT) == 0 && res_init () == -1) { __set_h_errno (NETDB_INTERNAL); - return NULL; + return; } #endif /* need _res */ @@ -188,7 +188,7 @@ ENDFUNC_NAME (void) if ((_res.options & RES_INIT) == 0 && res_init () == -1) { __set_h_errno (NETDB_INTERNAL); - return NULL; + return; } #endif /* need _res */ @@ -225,7 +225,8 @@ INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen, if ((_res.options & RES_INIT) == 0 && res_init () == -1) { __set_h_errno (NETDB_INTERNAL); - return NULL; + *result = NULL; + return -1; } #endif /* need _res */