diff options
| author | Denis Vlasenko | 2006-10-20 13:28:22 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2006-10-20 13:28:22 +0000 |
| commit | e1a0d486e4804eae098571f1a6788394c2ee51ae (patch) | |
| tree | c6f3435738900c8d53832eb919b1b2c3d524f2e5 /editors | |
| parent | dd2982882bb192ea757f32514bc2ea0bc96f5ba0 (diff) | |
| download | busybox-e1a0d486e4804eae098571f1a6788394c2ee51ae.zip busybox-e1a0d486e4804eae098571f1a6788394c2ee51ae.tar.gz | |
message string changes, mostly for consistency, also -32 bytes in .rodata
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/awk.c | 2 | ||||
| -rw-r--r-- | editors/patch.c | 8 | ||||
| -rw-r--r-- | editors/vi.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/editors/awk.c b/editors/awk.c index e74053e..e91c376 100644 --- a/editors/awk.c +++ b/editors/awk.c @@ -2716,7 +2716,7 @@ keep_going: free(s); } if (opt & 0x8) // -W - bb_error_msg("Warning: unrecognized option '-W %s' ignored", opt_W); + bb_error_msg("warning: unrecognized option '-W %s' ignored", opt_W); if (!from_file) { if (argc == optind) diff --git a/editors/patch.c b/editors/patch.c index 545e70b..4ddcd00 100644 --- a/editors/patch.c +++ b/editors/patch.c @@ -37,7 +37,7 @@ static unsigned int copy_lines(FILE *src_stream, FILE *dest_stream, const unsign break; } if (fputs(line, dest_stream) == EOF) { - bb_perror_msg_and_die("Error writing to new file"); + bb_perror_msg_and_die("error writing to new file"); } free(line); @@ -125,7 +125,7 @@ int patch_main(int argc, char **argv) patch_line = xmalloc_fgets(patch_file); if (strncmp(patch_line, "+++ ", 4) != 0) { ret = 2; - bb_error_msg("Invalid patch"); + bb_error_msg("invalid patch"); continue; } new_filename = extract_filename(patch_line, patch_level); @@ -189,7 +189,7 @@ int patch_main(int argc, char **argv) /* src_beg_line will be 0 if its a new file */ count = src_beg_line - src_cur_line; if (copy_lines(src_stream, dst_stream, count) != count) { - bb_error_msg_and_die("Bad src file"); + bb_error_msg_and_die("bad src file"); } src_cur_line += count; dest_cur_line += count; @@ -209,7 +209,7 @@ int patch_main(int argc, char **argv) src_cur_line++; } if (strcmp(src_line, patch_line + 1) != 0) { - bb_error_msg("Hunk #%d FAILED at %d.", hunk_count, hunk_offset_start); + bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start); hunk_error++; free(patch_line); break; diff --git a/editors/vi.c b/editors/vi.c index a25e966..82985ce 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -1802,7 +1802,7 @@ static Byte *yank_delete(Byte * start, Byte * stop, int dist, int yf) stop = p; } if (dist <= 0) { - // we can not cross NL boundaries + // we cannot cross NL boundaries p = start; if (*p == '\n') return (p); |