diff options
| author | Bernd Schmidt <bernds_cb1@t-online.de> | 2008-06-12 10:31:17 +0000 |
|---|---|---|
| committer | Bernd Schmidt <bernds_cb1@t-online.de> | 2008-06-12 10:31:17 +0000 |
| commit | e433ede08ba069f5100737e22eb8627187ae8f92 (patch) | |
| tree | 4c4a73520537a733eed495c342951a7c0112cd51 /libc/misc/mntent/mntent.c | |
| parent | 74d1d18f6bc7140f9bc5568b939870d8ec89b9ad (diff) | |
Revert revision 19347, plus libc_hidden_proto for __uc_malloc.
Some of the code is functionally identical before and after, but for now
I'm just mechanically reverting the entire mess.
Diffstat (limited to 'libc/misc/mntent/mntent.c')
| -rw-r--r-- | libc/misc/mntent/mntent.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/misc/mntent/mntent.c b/libc/misc/mntent/mntent.c index aaf0b68e6..c3367955c 100644 --- a/libc/misc/mntent/mntent.c +++ b/libc/misc/mntent/mntent.c @@ -7,7 +7,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> #include <mntent.h> #include <bits/uClibc_mutex.h> @@ -26,7 +25,6 @@ libc_hidden_proto(fseek) libc_hidden_proto(fgets) libc_hidden_proto(abort) libc_hidden_proto(fprintf) -libc_hidden_proto(__uc_malloc) /* Reentrant version of getmntent. */ struct mntent *getmntent_r (FILE *filep, @@ -86,7 +84,9 @@ struct mntent *getmntent(FILE * filep) __UCLIBC_MUTEX_LOCK(mylock); if (!buff) { - buff = __uc_malloc(BUFSIZ); + buff = malloc(BUFSIZ); + if (!buff) + abort(); } tmp = getmntent_r(filep, &mnt, buff, BUFSIZ); |