summaryrefslogtreecommitdiff
path: root/libc/inet/getservice.c
diff options
context:
space:
mode:
authorBernd Schmidt <bernds_cb1@t-online.de>2008-06-12 10:31:17 +0000
committerBernd Schmidt <bernds_cb1@t-online.de>2008-06-12 10:31:17 +0000
commite433ede08ba069f5100737e22eb8627187ae8f92 (patch)
tree4c4a73520537a733eed495c342951a7c0112cd51 /libc/inet/getservice.c
parent74d1d18f6bc7140f9bc5568b939870d8ec89b9ad (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/getservice.c')
-rw-r--r--libc/inet/getservice.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c
index c8ee77559..bb1d6d2e4 100644
--- a/libc/inet/getservice.c
+++ b/libc/inet/getservice.c
@@ -59,7 +59,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <malloc.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <errno.h>
@@ -73,7 +72,6 @@ libc_hidden_proto(atoi)
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_RECURSIVE_MUTEX_INITIALIZER_NP);
@@ -92,7 +90,9 @@ static smallint serv_stayopen;
static void __initbuf(void)
{
if (!servbuf) {
- servbuf = __uc_malloc(SBUFSIZE);
+ servbuf = malloc(SBUFSIZE);
+ if (!servbuf)
+ abort();
}
}