From 74d1d18f6bc7140f9bc5568b939870d8ec89b9ad Mon Sep 17 00:00:00 2001 From: Bernd Schmidt Date: Thu, 12 Jun 2008 10:14:14 +0000 Subject: Revert revision 19345 plus libc_hidden_proto for __uc_malloc. --- libc/misc/utmp/utent.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'libc/misc/utmp') diff --git a/libc/misc/utmp/utent.c b/libc/misc/utmp/utent.c index d71aa312f..6c1793e65 100644 --- a/libc/misc/utmp/utent.c +++ b/libc/misc/utmp/utent.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -30,7 +29,6 @@ libc_hidden_proto(open) libc_hidden_proto(fcntl) libc_hidden_proto(close) libc_hidden_proto(lseek) -libc_hidden_proto(__uc_malloc) #include __UCLIBC_MUTEX_STATIC(utmplock, PTHREAD_MUTEX_INITIALIZER); @@ -38,10 +36,9 @@ __UCLIBC_MUTEX_STATIC(utmplock, PTHREAD_MUTEX_INITIALIZER); /* Some global crap */ -static const char default_file_name[] = _PATH_UTMP; - static int static_fd = -1; -static struct utmp *static_utmp; +static struct utmp static_utmp; +static const char default_file_name[] = _PATH_UTMP; static const char *static_ut_name = (const char *) default_file_name; /* This function must be called with the LOCK held */ @@ -92,11 +89,9 @@ static struct utmp *__getutent(int utmp_fd) return NULL; } - free(static_utmp); - static_utmp = __uc_malloc(sizeof(*static_utmp)); - if (read(utmp_fd, (char *) static_utmp, sizeof(*static_utmp)) == sizeof(*static_utmp)) + if (read(utmp_fd, (char *) &static_utmp, sizeof(struct utmp)) == sizeof(struct utmp)) { - ret = static_utmp; + ret = &static_utmp; } return ret; -- cgit v1.2.3