diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-27 09:02:31 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-27 09:02:31 +0000 |
commit | d3d004dd3507f841745956a035fff68936378f9c (patch) | |
tree | 139fa79a102d11dbab9828d2649c119245b196b1 /coreutils | |
parent | 1340ca8c87d81bf00e604905f25bc04da22e980f (diff) | |
download | busybox-w32-d3d004dd3507f841745956a035fff68936378f9c.tar.gz busybox-w32-d3d004dd3507f841745956a035fff68936378f9c.tar.bz2 busybox-w32-d3d004dd3507f841745956a035fff68936378f9c.zip |
last nail into error_msg() (de)capitalization
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/sort.c | 8 | ||||
-rw-r--r-- | coreutils/uudecode.c | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/coreutils/sort.c b/coreutils/sort.c index 972477bab..1ba05ecd7 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c | |||
@@ -153,7 +153,7 @@ static int compare_keys(const void *xarg, const void *yarg) | |||
153 | /* Perform actual comparison */ | 153 | /* Perform actual comparison */ |
154 | switch(flags&7) { | 154 | switch(flags&7) { |
155 | default: | 155 | default: |
156 | bb_error_msg_and_die("Unknown sort type."); | 156 | bb_error_msg_and_die("unknown sort type"); |
157 | break; | 157 | break; |
158 | /* Ascii sort */ | 158 | /* Ascii sort */ |
159 | case 0: | 159 | case 0: |
@@ -233,12 +233,12 @@ int sort_main(int argc, char **argv) | |||
233 | switch(*line) { | 233 | switch(*line) { |
234 | #ifdef CONFIG_FEATURE_SORT_BIG | 234 | #ifdef CONFIG_FEATURE_SORT_BIG |
235 | case 'o': | 235 | case 'o': |
236 | if(outfile) bb_error_msg_and_die("Too many -o."); | 236 | if(outfile) bb_error_msg_and_die("too many -o"); |
237 | outfile=xfopen(optarg,"w"); | 237 | outfile=xfopen(optarg,"w"); |
238 | break; | 238 | break; |
239 | case 't': | 239 | case 't': |
240 | if(key_separator || optarg[1]) | 240 | if(key_separator || optarg[1]) |
241 | bb_error_msg_and_die("Too many -t."); | 241 | bb_error_msg_and_die("too many -t"); |
242 | key_separator=*optarg; | 242 | key_separator=*optarg; |
243 | break; | 243 | break; |
244 | /* parse sort key */ | 244 | /* parse sort key */ |
@@ -262,7 +262,7 @@ int sort_main(int argc, char **argv) | |||
262 | temp2=strchr(optlist,*temp); | 262 | temp2=strchr(optlist,*temp); |
263 | flag=(1<<(temp2-optlist)); | 263 | flag=(1<<(temp2-optlist)); |
264 | if(!temp2 || (flag>FLAG_M && flag<FLAG_b)) | 264 | if(!temp2 || (flag>FLAG_M && flag<FLAG_b)) |
265 | bb_error_msg_and_die("Unknown key option."); | 265 | bb_error_msg_and_die("unknown key option"); |
266 | /* b after , means strip _trailing_ space */ | 266 | /* b after , means strip _trailing_ space */ |
267 | if(i && flag==FLAG_b) flag=FLAG_bb; | 267 | if(i && flag==FLAG_b) flag=FLAG_bb; |
268 | key->flags|=flag; | 268 | key->flags|=flag; |
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c index a08d985ac..8b7de74ff 100644 --- a/coreutils/uudecode.c +++ b/coreutils/uudecode.c | |||
@@ -23,7 +23,7 @@ static int read_stduu(FILE *src_stream, FILE *dst_stream) | |||
23 | char *line_ptr = line; | 23 | char *line_ptr = line; |
24 | 24 | ||
25 | if (strcmp(line, "end") == 0) { | 25 | if (strcmp(line, "end") == 0) { |
26 | return(EXIT_SUCCESS); | 26 | return EXIT_SUCCESS; |
27 | } | 27 | } |
28 | length = ((*line_ptr - 0x20) & 0x3f)* 4 / 3; | 28 | length = ((*line_ptr - 0x20) & 0x3f)* 4 / 3; |
29 | 29 | ||
@@ -32,13 +32,13 @@ static int read_stduu(FILE *src_stream, FILE *dst_stream) | |||
32 | continue; | 32 | continue; |
33 | } | 33 | } |
34 | if (length > 60) { | 34 | if (length > 60) { |
35 | bb_error_msg_and_die("Line too long"); | 35 | bb_error_msg_and_die("line too long"); |
36 | } | 36 | } |
37 | 37 | ||
38 | line_ptr++; | 38 | line_ptr++; |
39 | /* Tolerate an overly long line to accomodate a possible exta '`' */ | 39 | /* Tolerate an overly long line to accomodate a possible exta '`' */ |
40 | if (strlen(line_ptr) < (size_t)length) { | 40 | if (strlen(line_ptr) < (size_t)length) { |
41 | bb_error_msg_and_die("Short file"); | 41 | bb_error_msg_and_die("short file"); |
42 | } | 42 | } |
43 | 43 | ||
44 | while (length > 0) { | 44 | while (length > 0) { |
@@ -63,7 +63,7 @@ static int read_stduu(FILE *src_stream, FILE *dst_stream) | |||
63 | } | 63 | } |
64 | free(line); | 64 | free(line); |
65 | } | 65 | } |
66 | bb_error_msg_and_die("Short file"); | 66 | bb_error_msg_and_die("short file"); |
67 | } | 67 | } |
68 | 68 | ||
69 | static int read_base64(FILE *src_stream, FILE *dst_stream) | 69 | static int read_base64(FILE *src_stream, FILE *dst_stream) |
@@ -84,7 +84,7 @@ static int read_base64(FILE *src_stream, FILE *dst_stream) | |||
84 | do { | 84 | do { |
85 | ch = fgetc(src_stream); | 85 | ch = fgetc(src_stream); |
86 | if (ch == EOF) { | 86 | if (ch == EOF) { |
87 | bb_error_msg_and_die("Short file"); | 87 | bb_error_msg_and_die("short file"); |
88 | } | 88 | } |
89 | } while ((table_ptr = strchr(base64_table, ch)) == NULL); | 89 | } while ((table_ptr = strchr(base64_table, ch)) == NULL); |
90 | 90 | ||
@@ -101,7 +101,7 @@ static int read_base64(FILE *src_stream, FILE *dst_stream) | |||
101 | else if (*table_ptr == '\n') { | 101 | else if (*table_ptr == '\n') { |
102 | /* Check for terminating line */ | 102 | /* Check for terminating line */ |
103 | if (term_count == 5) { | 103 | if (term_count == 5) { |
104 | return(EXIT_SUCCESS); | 104 | return EXIT_SUCCESS; |
105 | } | 105 | } |
106 | term_count = 1; | 106 | term_count = 1; |
107 | continue; | 107 | continue; |
@@ -175,7 +175,7 @@ int uudecode_main(int argc, char **argv) | |||
175 | free(line); | 175 | free(line); |
176 | ret = decode_fn_ptr(src_stream, dst_stream); | 176 | ret = decode_fn_ptr(src_stream, dst_stream); |
177 | fclose_if_not_stdin(src_stream); | 177 | fclose_if_not_stdin(src_stream); |
178 | return(ret); | 178 | return ret; |
179 | } | 179 | } |
180 | bb_error_msg_and_die("No `begin' line"); | 180 | bb_error_msg_and_die("no 'begin' line"); |
181 | } | 181 | } |