Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / stdlib / rpmatch.c

diff --git a/stdlib/rpmatch.c b/stdlib/rpmatch.c
index f3cc520f8b18aba13f34d475087a19a5abc44b48..04c0d189dbee28fa40f0cd29dab3bad2c4bd42d8 100644 (file)
--- a/stdlib/rpmatch.c
+++ b/stdlib/rpmatch.c
@@ -1,7 +1,7 @@
 /* Determine whether string value is affirmation or negative response
    according to current locale's data.
    This file is part of the GNU C Library.
-   Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996-2015 Free Software Foundation, Inc.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -14,51 +14,48 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <langinfo.h>
 #include <stdlib.h>
 #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 inline int try (const int tag, const int match, const int nomatch,
-                      const char **lastp, regex_t *re);
-
-  inline 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));
 }