Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
b588157e
Commit
b588157e
authored
Sep 12, 2007
by
Glenn Morris
Browse files
(C_ALLOCA): Remove all references and code that was only used when
this was defined.
parent
0bda13a2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
18 deletions
+1
-18
src/regex.c
src/regex.c
+1
-18
No files found.
src/regex.c
View file @
b588157e
...
...
@@ -1366,18 +1366,12 @@ static const char *re_error_msgid[] =
/* Normally, this is fine. */
#define MATCH_MAY_ALLOCATE
/* When using GNU C, we are not REALLY using the C alloca, no matter
what config.h may say. So don't take precautions for it. */
#ifdef __GNUC__
# undef C_ALLOCA
#endif
/* The match routines may not allocate if (1) they would do it with malloc
and (2) it's not safe for them to use malloc.
Note that if REL_ALLOC is defined, matching would not use malloc for the
failure stack, but we would still use it for the register vectors;
so REL_ALLOC should not affect this. */
#if
(defined C_ALLOCA ||
defined REGEX_MALLOC
)
&& defined emacs
#if defined REGEX_MALLOC && defined emacs
# undef MATCH_MAY_ALLOCATE
#endif
...
...
@@ -4454,11 +4448,6 @@ re_search_2 (bufp, str1, size1, str2, size2, startpos, range, regs, stop)
val
=
re_match_2_internal
(
bufp
,
string1
,
size1
,
string2
,
size2
,
startpos
,
regs
,
stop
);
#ifndef REGEX_MALLOC
# ifdef C_ALLOCA
alloca
(
0
);
# endif
#endif
if
(
val
>=
0
)
return
startpos
;
...
...
@@ -4894,9 +4883,6 @@ re_match (bufp, string, size, pos, regs)
{
int
result
=
re_match_2_internal
(
bufp
,
NULL
,
0
,
(
re_char
*
)
string
,
size
,
pos
,
regs
,
size
);
# if defined C_ALLOCA && !defined REGEX_MALLOC
alloca
(
0
);
# endif
return
result
;
}
WEAK_ALIAS
(
__re_match
,
re_match
)
...
...
@@ -4942,9 +4928,6 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
result
=
re_match_2_internal
(
bufp
,
(
re_char
*
)
string1
,
size1
,
(
re_char
*
)
string2
,
size2
,
pos
,
regs
,
stop
);
#if defined C_ALLOCA && !defined REGEX_MALLOC
alloca
(
0
);
#endif
return
result
;
}
WEAK_ALIAS
(
__re_match_2
,
re_match_2
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment