cosmetics: prettify names for compiled object for bison

[bison.git] / src / scan-gram.l

diff --git a/src/scan-gram.l b/src/scan-gram.l
index e2e08f9ab9dbf62253ee67e27d4c59c0d5840c52..d375fc12ccdf71e426e00771967e629e6d8a5a16 100644 (file)
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -39,7 +39,6 @@
 #include <ctype.h>
 #include <mbswidth.h>
 #include <quote.h>
-#include <streq.h>
 
 #include <src/scan-gram.h>
 
@@ -942,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"));
@@ -968,7 +967,7 @@ unexpected_end (boundary start, char const *msgid, char const *token_end)
   loc.end = scanner_cursor;
   token_end = quote (token_end);
   // Instead of '\'', display "'".
-  if (STREQ (token_end, "'\\''", '\'', '\\', '\'', '\'', 0,0,0,0,0))
+  if (STREQ (token_end, "'\\''"))
     token_end = "\"'\"";
   complain_at (loc, _(msgid), token_end);
 }