summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libc/inet/getnetent.c7
-rw-r--r--libc/inet/getproto.c6
-rw-r--r--libc/inet/getservice.c6
-rw-r--r--libc/inet/rpc/ruserpass.c7
-rw-r--r--libc/misc/mntent/mntent.c6
-rw-r--r--libc/misc/regex/regex_old.c10
-rw-r--r--libc/misc/ttyent/getttyent.c6
7 files changed, 19 insertions, 29 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);
diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c
index 7f3b4e30f..1e3e843f5 100644
--- a/libc/inet/getproto.c
+++ b/libc/inet/getproto.c
@@ -59,7 +59,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <malloc.h>
#include <errno.h>
#include <unistd.h>
@@ -71,7 +70,6 @@ libc_hidden_proto(rewind)
libc_hidden_proto(fgets)
libc_hidden_proto(fclose)
libc_hidden_proto(abort)
-libc_hidden_proto(__uc_malloc)
#include <bits/uClibc_mutex.h>
__UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
@@ -89,7 +87,9 @@ static smallint proto_stayopen;
static void __initbuf(void)
{
if (!static_aliases) {
- static_aliases = __uc_malloc(SBUFSIZE);
+ static_aliases = malloc(SBUFSIZE);
+ if (!static_aliases)
+ abort();
}
}
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();
}
}
diff --git a/libc/inet/rpc/ruserpass.c b/libc/inet/rpc/ruserpass.c
index 75d68dd91..ad6e703c4 100644
--- a/libc/inet/rpc/ruserpass.c
+++ b/libc/inet/rpc/ruserpass.c
@@ -40,7 +40,6 @@
#include <stdio_ext.h>
#include <stdlib.h>
#include <string.h>
-#include <malloc.h>
#include <unistd.h>
/* Experimentally off - libc_hidden_proto(strcat) */
@@ -64,7 +63,6 @@ libc_hidden_proto(fopen)
libc_hidden_proto(fclose)
libc_hidden_proto(getc_unlocked)
libc_hidden_proto(__fgetc_unlocked)
-libc_hidden_proto(__uc_malloc)
#define _(X) (X)
/* #include "ftp_var.h" */
@@ -80,7 +78,7 @@ static FILE *cfile;
#define ID 10
#define MACHINE 11
-static char *tokval; /* [100] */
+static char tokval[100];
static const char tokstr[] =
{
@@ -153,9 +151,6 @@ int ruserpass(const char *host, const char **aname, const char **apass)
if (mydomain==NULL) {
mydomain=myname + strlen(myname);
}
-
- if (!tokval)
- tokval = __uc_malloc(100);
next:
while ((t = token())) switch(t) {
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);
diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c
index b79b41aa3..dc5781967 100644
--- a/libc/misc/regex/regex_old.c
+++ b/libc/misc/regex/regex_old.c
@@ -36,7 +36,6 @@
#include <stdint.h>
#include <string.h>
#include <unistd.h>
-#include <malloc.h>
#include <stdio.h>
/* Experimentally off - libc_hidden_proto(memset) */
@@ -49,7 +48,6 @@ libc_hidden_proto(abort)
#ifdef __USE_GNU
/* Experimentally off - libc_hidden_proto(mempcpy) */
#endif
-libc_hidden_proto(__uc_malloc)
/* AIX requires this to be the first thing in the file. */
#if defined _AIX && !defined REGEX_MALLOC
@@ -309,7 +307,7 @@ extern char *re_syntax_table;
# else /* not SYNTAX_TABLE */
-static char *re_syntax_table; /* [CHAR_SET_SIZE] */
+static char re_syntax_table[CHAR_SET_SIZE];
static void init_syntax_once PARAMS ((void));
@@ -317,13 +315,11 @@ static void
init_syntax_once ()
{
register int c;
- static char done;
+ static int done = 0;
if (done)
return;
-
- re_syntax_table = __uc_malloc(CHAR_SET_SIZE);
- bzero (re_syntax_table, CHAR_SET_SIZE);
+ bzero (re_syntax_table, sizeof re_syntax_table);
for (c = 0; c < CHAR_SET_SIZE; ++c)
if (ISALNUM (c))
diff --git a/libc/misc/ttyent/getttyent.c b/libc/misc/ttyent/getttyent.c
index 7ec228514..b43422ddc 100644
--- a/libc/misc/ttyent/getttyent.c
+++ b/libc/misc/ttyent/getttyent.c
@@ -34,7 +34,6 @@
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
-#include <malloc.h>
#ifdef __UCLIBC_HAS_THREADS__
#include <pthread.h>
#endif
@@ -55,7 +54,6 @@ libc_hidden_proto(__ctype_b_loc)
#elif defined __UCLIBC_HAS_CTYPE_TABLES__
libc_hidden_proto(__ctype_b)
#endif
-libc_hidden_proto(__uc_malloc)
static char zapchar;
static FILE *tf;
@@ -134,7 +132,9 @@ struct ttyent * getttyent(void)
return (NULL);
if (!line) {
- line = __uc_malloc(BUFSIZ);
+ line = malloc(BUFSIZ);
+ if (!line)
+ abort();
}
__STDIO_ALWAYS_THREADLOCK(tf);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 20:29:41 +0000