From: Akim Demaille <akim@lrde.epita.fr>
Date: Tue, 5 Jun 2012 15:46:58 +0000 (+0200)
Subject: maint: don't use mbsr?chr.
X-Git-Tag: v2.7.90~443
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/84526bf3d156154d8372fff0d232dd4f347f2233

maint: don't use mbsr?chr.

Basically, revert ba60c39547a445dee3e07920931b4d7a81843868's move to
mbs* functions, which was prompted by -DGNULIB_POSIXCHECK.  See
<http://lists.gnu.org/archive/html/bison-patches/2012-05/msg00052.html>
and following.

* bootstrap.conf: No longer ask for them.
* src/files.c, src/getargs.c, src/location.c,
* src/parse-gram.c, src/parse-gram.y, src/scan-gram.l,
* src/symtab.c: s/mbs(r?chr)/str$1/g.
---

diff --git a/bootstrap.conf b/bootstrap.conf
index c0140841..6cdb017c 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -24,7 +24,7 @@ gnulib_modules='
   error extensions fdl fopen-safer gendocs getopt-gnu
   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script
-  javaexec-script ldexpl maintainer-makefile malloc-gnu mbschr mbsrchr
+  javaexec-script ldexpl maintainer-makefile malloc-gnu
   mbswidth obstack perror progname
   quote quotearg
   readme-release
diff --git a/lib/.gitignore b/lib/.gitignore
index 0b3bcc91..8e0e2096 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -109,9 +109,7 @@
 /mbchar.c
 /mbchar.h
 /mbrtowc.c
-/mbschr.c
 /mbsinit.c
-/mbsrchr.c
 /mbswidth.c
 /mbswidth.h
 /mbuiter.h
diff --git a/src/files.c b/src/files.c
index 550e42ed..b7000cfa 100644
--- a/src/files.c
+++ b/src/files.c
@@ -207,7 +207,7 @@ file_name_split (const char *file_name,
   *base = last_component (file_name);
 
   /* Look for the extension, i.e., look for the last dot. */
-  *ext = mbsrchr (*base, '.');
+  *ext = strrchr (*base, '.');
   *tab = NULL;
 
   /* If there is an extension, check if there is a `.tab' part right
diff --git a/src/getargs.c b/src/getargs.c
index d7e1ad41..82e4e356 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -559,7 +559,7 @@ getargs (int argc, char *argv[])
       case 'F': /* -FNAME[=VALUE]. */
         {
           char* name = optarg;
-          char* value = mbschr (optarg, '=');
+          char* value = strchr (optarg, '=');
           if (value)
             *value++ = 0;
           muscle_percent_define_insert (name, command_line_location (),
diff --git a/src/location.c b/src/location.c
index 281a8870..88887e92 100644
--- a/src/location.c
+++ b/src/location.c
@@ -143,11 +143,11 @@ boundary_set_from_string (boundary *bound, char *loc_str)
 {
   /* Must search in reverse since the file name field may
    * contain `.' or `:'.  */
-  char *delim = mbsrchr (loc_str, '.');
+  char *delim = strrchr (loc_str, '.');
   aver (delim);
   *delim = '\0';
   bound->column = atoi (delim+1);
-  delim = mbsrchr (loc_str, ':');
+  delim = strrchr (loc_str, ':');
   aver (delim);
   *delim = '\0';
   bound->line = atoi (delim+1);
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 2cfebe4e..8539085b 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -2431,7 +2431,7 @@ yyreduce:
 #line 343 "src/parse-gram.y"
     {
       char const *skeleton_user = (yyvsp[0].chars);
-      if (mbschr (skeleton_user, '/'))
+      if (strchr (skeleton_user, '/'))
         {
           size_t dir_length = strlen (current_file);
           char *skeleton_build;
diff --git a/src/parse-gram.y b/src/parse-gram.y
index 74eb4aee..8e385196 100644
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -342,7 +342,7 @@ prologue_declaration:
 | "%skeleton" STRING
     {
       char const *skeleton_user = $2;
-      if (mbschr (skeleton_user, '/'))
+      if (strchr (skeleton_user, '/'))
         {
           size_t dir_length = strlen (current_file);
           char *skeleton_build;
diff --git a/src/scan-gram.l b/src/scan-gram.l
index fa200d64..d375fc12 100644
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -941,8 +941,8 @@ handle_syncline (char *args, location loc)
 {
   char *after_num;
   unsigned long int lineno = strtoul (args, &after_num, 10);
-  char *file = mbschr (after_num, '"') + 1;
-  *mbschr (file, '"') = '\0';
+  char *file = strchr (after_num, '"') + 1;
+  *strchr (file, '"') = '\0';
   if (INT_MAX <= lineno)
     {
       warn_at (loc, _("line number overflow"));
diff --git a/src/symtab.c b/src/symtab.c
index b3f94560..d25b9368 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -67,7 +67,7 @@ symbol_new (uniqstr tag, location loc)
 
   /* If the tag is not a string (starts with a double quote), check
      that it is valid for Yacc. */
-  if (tag[0] != '\"' && tag[0] != '\'' && mbschr (tag, '-'))
+  if (tag[0] != '\"' && tag[0] != '\'' && strchr (tag, '-'))
     yacc_at (loc, _("POSIX Yacc forbids dashes in symbol names: %s"),
              tag);