diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-20 13:28:22 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-20 13:28:22 +0000 |
commit | e1a0d486e4804eae098571f1a6788394c2ee51ae (patch) | |
tree | c6f3435738900c8d53832eb919b1b2c3d524f2e5 /networking/libiproute | |
parent | dd2982882bb192ea757f32514bc2ea0bc96f5ba0 (diff) | |
download | busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.tar.gz busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.tar.bz2 busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.zip |
message string changes, mostly for consistency, also -32 bytes in .rodata
Diffstat (limited to 'networking/libiproute')
-rw-r--r-- | networking/libiproute/iplink.c | 10 | ||||
-rw-r--r-- | networking/libiproute/utils.c | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c index d9f28374b..f79dab402 100644 --- a/networking/libiproute/iplink.c +++ b/networking/libiproute/iplink.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | /* | 2 | /* |
3 | * iplink.c "ip link". | 3 | * iplink.c "ip link". |
4 | * | 4 | * |
5 | * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> | 5 | * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> |
6 | * | 6 | * |
7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
8 | */ | 8 | */ |
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | static int on_off(char *msg) | 32 | static int on_off(char *msg) |
33 | { | 33 | { |
34 | bb_error_msg("Error: argument of \"%s\" must be \"on\" or \"off\"", msg); | 34 | bb_error_msg("error: argument of \"%s\" must be \"on\" or \"off\"", msg); |
35 | return -1; | 35 | return -1; |
36 | } | 36 | } |
37 | 37 | ||
@@ -200,7 +200,7 @@ static int parse_address(char *dev, int hatype, int halen, char *lla, struct ifr | |||
200 | if (alen < 0) | 200 | if (alen < 0) |
201 | return -1; | 201 | return -1; |
202 | if (alen != halen) { | 202 | if (alen != halen) { |
203 | bb_error_msg("Wrong address (%s) length: expected %d bytes", lla, halen); | 203 | bb_error_msg("wrong address (%s) length: expected %d bytes", lla, halen); |
204 | return -1; | 204 | return -1; |
205 | } | 205 | } |
206 | return 0; | 206 | return 0; |
@@ -349,6 +349,6 @@ int do_iplink(int argc, char **argv) | |||
349 | } else | 349 | } else |
350 | return ipaddr_list_link(0, NULL); | 350 | return ipaddr_list_link(0, NULL); |
351 | 351 | ||
352 | bb_error_msg("Command \"%s\" is unknown.", *argv); | 352 | bb_error_msg("command \"%s\" is unknown", *argv); |
353 | exit(-1); | 353 | exit(-1); |
354 | } | 354 | } |
diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c index 094a3b0ac..552f4bf77 100644 --- a/networking/libiproute/utils.c +++ b/networking/libiproute/utils.c | |||
@@ -206,10 +206,10 @@ int get_prefix_1(inet_prefix * dst, char *arg, int family) | |||
206 | int get_addr(inet_prefix * dst, char *arg, int family) | 206 | int get_addr(inet_prefix * dst, char *arg, int family) |
207 | { | 207 | { |
208 | if (family == AF_PACKET) { | 208 | if (family == AF_PACKET) { |
209 | bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context.", arg); | 209 | bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context", arg); |
210 | } | 210 | } |
211 | if (get_addr_1(dst, arg, family)) { | 211 | if (get_addr_1(dst, arg, family)) { |
212 | bb_error_msg_and_die("an inet address is expected rather than \"%s\".", arg); | 212 | bb_error_msg_and_die("an inet address is expected rather than \"%s\"", arg); |
213 | } | 213 | } |
214 | return 0; | 214 | return 0; |
215 | } | 215 | } |
@@ -217,10 +217,10 @@ int get_addr(inet_prefix * dst, char *arg, int family) | |||
217 | int get_prefix(inet_prefix * dst, char *arg, int family) | 217 | int get_prefix(inet_prefix * dst, char *arg, int family) |
218 | { | 218 | { |
219 | if (family == AF_PACKET) { | 219 | if (family == AF_PACKET) { |
220 | bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context.", arg); | 220 | bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context", arg); |
221 | } | 221 | } |
222 | if (get_prefix_1(dst, arg, family)) { | 222 | if (get_prefix_1(dst, arg, family)) { |
223 | bb_error_msg_and_die("an inet address is expected rather than \"%s\".", arg); | 223 | bb_error_msg_and_die("an inet address is expected rather than \"%s\"", arg); |
224 | } | 224 | } |
225 | return 0; | 225 | return 0; |
226 | } | 226 | } |
@@ -237,7 +237,7 @@ __u32 get_addr32(char *name) | |||
237 | 237 | ||
238 | void incomplete_command(void) | 238 | void incomplete_command(void) |
239 | { | 239 | { |
240 | bb_error_msg("Command line is not complete. Try option \"help\""); | 240 | bb_error_msg("command line is not complete, try option \"help\""); |
241 | exit(-1); | 241 | exit(-1); |
242 | } | 242 | } |
243 | 243 | ||
@@ -249,13 +249,13 @@ void invarg(const char * const arg, const char * const opt) | |||
249 | 249 | ||
250 | void duparg(char *key, char *arg) | 250 | void duparg(char *key, char *arg) |
251 | { | 251 | { |
252 | bb_error_msg("duplicate \"%s\": \"%s\" is the second value.", key, arg); | 252 | bb_error_msg("duplicate \"%s\": \"%s\" is the second value", key, arg); |
253 | exit(-1); | 253 | exit(-1); |
254 | } | 254 | } |
255 | 255 | ||
256 | void duparg2(char *key, char *arg) | 256 | void duparg2(char *key, char *arg) |
257 | { | 257 | { |
258 | bb_error_msg("either \"%s\" is duplicate, or \"%s\" is a garbage.", key, arg); | 258 | bb_error_msg("either \"%s\" is duplicate, or \"%s\" is a garbage", key, arg); |
259 | exit(-1); | 259 | exit(-1); |
260 | } | 260 | } |
261 | 261 | ||