From 2fc0f614becf8e7de4fbd5b87cbc812b407ad39a Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sun, 26 May 2013 14:06:25 -0400 Subject: [PATCH] [SV #39028] Fix some small typos in messages. --- ChangeLog | 7 +++++++ main.c | 2 +- read.c | 4 ++-- remake.c | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4f91303..ff5bec59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,13 @@ already does. Otherwise, the linker will look for, and fail to find, gmk_* functions in some external dynamic library. +2013-05-17 Benno Schulenberg + + * main.c (decode_output_sync_flags): Fix output message. + * read.c (EXTRANEOUS): Ditto. + (record_files): Ditto. + * remake.c (update_file_1): Ditto. + 2013-05-17 Eli Zaretskii * main.c (prepare_mutex_handle_string): Define conditioned on diff --git a/main.c b/main.c index 2b302607..16ed3180 100644 --- a/main.c +++ b/main.c @@ -2793,7 +2793,7 @@ decode_switches (int argc, char **argv, int env) if (i < 1 || cp[0] != '\0') { - error (NILF, _("the '-%c' option requires a positive integral argument"), + error (NILF, _("the '-%c' option requires a positive integer argument"), cs->c); bad = 1; } diff --git a/read.c b/read.c index 87cd5548..36d3a8fa 100644 --- a/read.c +++ b/read.c @@ -1566,7 +1566,7 @@ conditional_line (char *line, int len, const gmk_floc *flocp) /* Found one: skip past it and any whitespace after it. */ line = next_token (line + len); -#define EXTRANEOUS() error (flocp, _("Extraneous text after '%s' directive"), cmdname) +#define EXTRANEOUS() error (flocp, _("extraneous text after '%s' directive"), cmdname) /* An 'endif' cannot contain extra text, and reduces the if-depth by 1 */ if (cmdtype == c_endif) @@ -2082,7 +2082,7 @@ record_files (struct nameseq *filenames, const char *pattern, more than once. Just give a warning since this is harmless. */ if (cmds != 0 && cmds == f->cmds) error (flocp, - _("target '%s' given more than once in the same rule."), + _("target '%s' given more than once in the same rule"), f->name); /* Check for two single-colon entries both with commands. diff --git a/remake.c b/remake.c index 95c97cb9..f56a8569 100644 --- a/remake.c +++ b/remake.c @@ -827,7 +827,7 @@ update_file_1 (struct file *file, unsigned int depth) DBF (DB_BASIC, _("Successfully remade target file '%s'.\n")); break; case 1: - DBF (DB_BASIC, _("Target file '%s' needs remade under -q.\n")); + DBF (DB_BASIC, _("Target file '%s' needs to be remade under -q.\n")); break; default: assert (file->update_status >= 0 && file->update_status <= 2);