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/inet/getnetent.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/inet/getnetent.c')
| -rw-r--r-- | libc/inet/getnetent.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libc/inet/getnetent.c b/libc/inet/getnetent.c index 6224243d1..863266d48 100644 --- a/libc/inet/getnetent.c +++ b/libc/inet/getnetent.c @@ -19,7 +19,6 @@ #include <features.h> #include <stdio.h> #include <stdlib.h> -#include <malloc.h> #include <netdb.h> #include <arpa/inet.h> #include <unistd.h> @@ -30,8 +29,6 @@ libc_hidden_proto(inet_network) libc_hidden_proto(rewind) libc_hidden_proto(fgets) libc_hidden_proto(abort) -libc_hidden_proto(__uc_malloc) - #include <bits/uClibc_mutex.h> __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER); @@ -101,7 +98,9 @@ struct netent *getnetent(void) again: if (!line) { - line = __uc_malloc(BUFSIZ + 1); + line = malloc(BUFSIZ + 1); + if (!line) + abort(); } p = fgets(line, BUFSIZ, netf); |