From c617db9065afa51100199d9ac4561feee4279291 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 12 Jun 2002 23:27:00 +0000 Subject: Silence warnings, clean things up. -Erik --- libc/pwd_grp/getspnam.c | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'libc/pwd_grp/getspnam.c') diff --git a/libc/pwd_grp/getspnam.c b/libc/pwd_grp/getspnam.c index 3865a0dc5..d8a29a8a2 100644 --- a/libc/pwd_grp/getspnam.c +++ b/libc/pwd_grp/getspnam.c @@ -21,41 +21,39 @@ #include #include #include -#include - -#define PWD_BUFFER_SIZE 256 +#include "config.h" int getspnam_r (const char *name, struct spwd *spwd, char *buff, size_t buflen, struct spwd **crap) { - int spwd_fd; + int spwd_fd; - if (name == NULL) { - __set_errno(EINVAL); - return -1; - } + if (name == NULL) { + __set_errno(EINVAL); + return -1; + } - if ((spwd_fd = open(_PATH_SHADOW, O_RDONLY)) < 0) - return -1; + if ((spwd_fd = open(_PATH_SHADOW, O_RDONLY)) < 0) + return -1; - while (__getspent_r(spwd, buff, buflen, spwd_fd) != -1) - if (!strcmp(spwd->sp_namp, name)) { - close(spwd_fd); - return 0; - } + while (__getspent_r(spwd, buff, buflen, spwd_fd) != -1) + if (!strcmp(spwd->sp_namp, name)) { + close(spwd_fd); + return 0; + } - close(spwd_fd); - return -1; + close(spwd_fd); + return -1; } struct spwd *getspnam(const char *name) { - static char line_buff[PWD_BUFFER_SIZE]; - static struct spwd spwd; + static char line_buff[PWD_BUFFER_SIZE]; + static struct spwd spwd; - if (getspnam_r(name, &spwd, line_buff, PWD_BUFFER_SIZE, NULL) != -1) { - return &spwd; - } - return NULL; + if (getspnam_r(name, &spwd, line_buff, sizeof(line_buff), NULL) != -1) { + return &spwd; + } + return NULL; } -- cgit v1.2.3