You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

82 lines
2.4 KiB

commit c079afb7724ce4b9ff2d6b1ca4d7e3cdebcbcd1f
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Sep 12 14:58:55 2014 -0700
Don't use a nested function in rpmatch.
diff --git a/stdlib/rpmatch.c b/stdlib/rpmatch.c
index 31285879ee7e6ff6..8c6290551bae1bcf 100644
--- a/stdlib/rpmatch.c
+++ b/stdlib/rpmatch.c
@@ -22,42 +22,40 @@
#include <regex.h>
-int
-rpmatch (response)
- const char *response;
+/* Match against one of the response patterns, compiling the pattern
+ first if necessary. */
+static int
+try (const char *response,
+ const int tag, const int match, const int nomatch,
+ const char **lastp, regex_t *re)
{
- /* Match against one of the response patterns, compiling the pattern
- first if necessary. */
- auto int try (const int tag, const int match, const int nomatch,
- const char **lastp, regex_t *re);
-
- int try (const int tag, const int match, const int nomatch,
- const char **lastp, regex_t *re)
+ const char *pattern = nl_langinfo (tag);
+ if (pattern != *lastp)
{
- const char *pattern = nl_langinfo (tag);
- if (pattern != *lastp)
- {
- /* The pattern has changed. */
- if (*lastp)
- {
- /* Free the old compiled pattern. */
- __regfree (re);
- *lastp = NULL;
- }
- /* Compile the pattern and cache it for future runs. */
- if (__regcomp (re, pattern, REG_EXTENDED) != 0)
- return -1;
- *lastp = pattern;
- }
-
- /* Try the pattern. */
- return __regexec (re, response, 0, NULL, 0) == 0 ? match : nomatch;
+ /* The pattern has changed. */
+ if (*lastp != NULL)
+ {
+ /* Free the old compiled pattern. */
+ __regfree (re);
+ *lastp = NULL;
+ }
+ /* Compile the pattern and cache it for future runs. */
+ if (__regcomp (re, pattern, REG_EXTENDED) != 0)
+ return -1;
+ *lastp = pattern;
}
+ /* Try the pattern. */
+ return __regexec (re, response, 0, NULL, 0) == 0 ? match : nomatch;
+}
+
+int
+rpmatch (const char *response)
+{
/* We cache the response patterns and compiled regexps here. */
static const char *yesexpr, *noexpr;
static regex_t yesre, nore;
- return (try (YESEXPR, 1, 0, &yesexpr, &yesre) ?:
- try (NOEXPR, 0, -1, &noexpr, &nore));
+ return (try (response, YESEXPR, 1, 0, &yesexpr, &yesre) ?:
+ try (response, NOEXPR, 0, -1, &noexpr, &nore));
}