diff options
author | Jim Meyering <meyering@redhat.com> | 2012-01-16 19:36:41 +0100 |
---|---|---|
committer | Akim Demaille <demaille@gostai.com> | 2012-01-24 19:31:27 +0100 |
commit | abf3f74b216c0ef4a5195ae1a5ebb7123b672387 (patch) | |
tree | 9852ef713f5302efa7aac5a7d8d21712793aba13 /djgpp | |
parent | 9874f80b2e813a8ad8e5562dbbaa30ecafd5e7d8 (diff) | |
download | bison-abf3f74b216c0ef4a5195ae1a5ebb7123b672387.tar.gz |
change more quotes in source, and adjust tests to match
Run this command to change each `%s' to '%s' in source directories:
git grep -l '`%s'\' src djgpp data \
|xargs perl -pi -e '$q="'\''";s/`%s$q/$q%s$q/g'
* data/bison.m4: Affected per the above.
* djgpp/subpipe.c: Likewise.
* src/files.c: Likewise.
* src/getargs.c: Likewise.
* src/muscle-tab.c: Likewise.
* src/reader.c: Likewise.
* tests/glr-regression.at: Adjust to match.
* tests/input.at: Likewise.
* tests/push.at: Likewise.
* tests/skeletons.at: Likewise.
(cherry picked from commit 4aa9d1ff9ca9b838fe02a9bfe5ae4b0f935e5451)
Conflicts:
src/getargs.c
src/muscle-tab.c
src/reader.c
tests/input.at
Diffstat (limited to 'djgpp')
-rw-r--r-- | djgpp/subpipe.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/djgpp/subpipe.c b/djgpp/subpipe.c index f726b53d..f85e8f96 100644 --- a/djgpp/subpipe.c +++ b/djgpp/subpipe.c @@ -60,7 +60,7 @@ static char tmp_file_name[2][L_tmpnam]; do { \ close ((fd)); \ if (unlink ((name))) \ - error (EXIT_FAILURE, 0, _("removing of `%s' failed"), (name)); \ + error (EXIT_FAILURE, 0, _("removing of '%s' failed"), (name)); \ } while (0) @@ -231,17 +231,17 @@ end_of_output_subpipe(pid_t pid, int fd[2]) { remove_tmp_file(STDIN_FILENO, tmp_file_name[0]); remove_tmp_file(STDOUT_FILENO, tmp_file_name[1]); - error(EXIT_FAILURE, 0, _("subsidiary program `%s' interrupted"), program); + error(EXIT_FAILURE, 0, _("subsidiary program '%s' interrupted"), program); } if (status) { remove_tmp_file(STDIN_FILENO, tmp_file_name[0]); remove_tmp_file(STDOUT_FILENO, tmp_file_name[1]); error(EXIT_FAILURE, 0, _(errno == ENOENT - ? "subsidiary program `%s' not found" + ? "subsidiary program '%s' not found" : status < 1 - ? "subsidiary program `%s' failed" - : "subsidiary program `%s' failed (status=%i, errno=%i)"), program, status, errno); + ? "subsidiary program '%s' failed" + : "subsidiary program '%s' failed (status=%i, errno=%i)"), program, status, errno); } @@ -283,9 +283,9 @@ reap_subpipe(pid_t pid, char const *program) free(arguments); if (unlink(tmp_file_name[0])) - error(EXIT_FAILURE, 0, _("removing of `%s' failed"), tmp_file_name[0]); + error(EXIT_FAILURE, 0, _("removing of '%s' failed"), tmp_file_name[0]); if (unlink(tmp_file_name[1])) - error(EXIT_FAILURE, 0, _("removing of `%s' failed"), tmp_file_name[1]); + error(EXIT_FAILURE, 0, _("removing of '%s' failed"), tmp_file_name[1]); if (dup2(old_stdin, STDIN_FILENO) < 0) error(EXIT_FAILURE, 0, "restore of bison's stdin failed"); |