summaryrefslogtreecommitdiff
path: root/libc/misc/regex/regex_old.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/misc/regex/regex_old.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/misc/regex/regex_old.c')
-rw-r--r--libc/misc/regex/regex_old.c10
1 files changed, 3 insertions, 7 deletions
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))