From 6331cf059ccfdf35f4e5a505cbae885094cc41b0 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 13 Nov 2009 09:08:27 +0100 Subject: *: use "can't" instead of "cannot" Signed-off-by: Denys Vlasenko --- networking/ether-wake.c | 2 +- networking/ipcalc.c | 2 +- networking/libiproute/ipaddress.c | 2 +- networking/libiproute/iproute.c | 4 ++-- networking/libiproute/iptunnel.c | 6 +++--- networking/libiproute/libnetlink.c | 2 +- networking/libiproute/ll_map.c | 2 +- networking/nameif.c | 4 ++-- networking/tc.c | 2 +- networking/tcpudp.c | 12 ++++++------ networking/udhcp/arpping.c | 2 +- networking/udhcp/dhcpd.c | 2 +- networking/udhcp/options.c | 2 +- networking/udhcp/signalpipe.c | 2 +- networking/wget.c | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) (limited to 'networking') diff --git a/networking/ether-wake.c b/networking/ether-wake.c index 59f40535c..e05db7a80 100644 --- a/networking/ether-wake.c +++ b/networking/ether-wake.c @@ -167,7 +167,7 @@ static int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd) byte_cnt = sscanf(ethoptarg, "%u.%u.%u.%u", &passwd[0], &passwd[1], &passwd[2], &passwd[3]); if (byte_cnt < 4) { - bb_error_msg("cannot read Wake-On-LAN pass"); + bb_error_msg("can't read Wake-On-LAN pass"); return 0; } // TODO: check invalid numbers >255?? diff --git a/networking/ipcalc.c b/networking/ipcalc.c index b5cc3dec4..18abc12eb 100644 --- a/networking/ipcalc.c +++ b/networking/ipcalc.c @@ -178,7 +178,7 @@ int ipcalc_main(int argc, char **argv) hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET); if (!hostinfo) { - bb_herror_msg_and_die("cannot find hostname for %s", argv[0]); + bb_herror_msg_and_die("can't find hostname for %s", argv[0]); } str_tolower(hostinfo->h_name); diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c index fcf9623e4..c450c6a9f 100644 --- a/networking/libiproute/ipaddress.c +++ b/networking/libiproute/ipaddress.c @@ -426,7 +426,7 @@ int ipaddr_list_or_flush(char **argv, int flush) bb_error_msg_and_die(bb_msg_requires_arg, "flush"); } if (filter.family == AF_PACKET) { - bb_error_msg_and_die("cannot flush link addresses"); + bb_error_msg_and_die("can't flush link addresses"); } } diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c index 7031bed34..67eb90b84 100644 --- a/networking/libiproute/iproute.c +++ b/networking/libiproute/iproute.c @@ -499,7 +499,7 @@ static void iproute_flush_cache(void) } if (write(flush_fd, "-1", 2) < 2) { - bb_perror_msg("cannot flush routing cache"); + bb_perror_msg("can't flush routing cache"); return; } close(flush_fd); @@ -681,7 +681,7 @@ static int iproute_list_or_flush(char **argv, int flush) if (filter.tb != -1) { xrtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE); } else if (rtnl_rtcache_request(&rth, do_ipv6) < 0) { - bb_perror_msg_and_die("cannot send dump request"); + bb_perror_msg_and_die("can't send dump request"); } xrtnl_dump_filter(&rth, print_route, NULL); diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c index 836709c7e..67afd1bfd 100644 --- a/networking/libiproute/iptunnel.c +++ b/networking/libiproute/iptunnel.c @@ -222,7 +222,7 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p) } p->iph.protocol = IPPROTO_IPV6; } else { - bb_error_msg_and_die("%s tunnel mode", "cannot guess"); + bb_error_msg_and_die("%s tunnel mode", "can't guess"); } } else if (key == ARG_key) { unsigned uval; @@ -377,7 +377,7 @@ static int do_add(int cmd, char **argv) case IPPROTO_IPV6: return do_add_ioctl(cmd, "sit0", &p); default: - bb_error_msg_and_die("cannot determine tunnel mode (ipip, gre or sit)"); + bb_error_msg_and_die("can't determine tunnel mode (ipip, gre or sit)"); } } @@ -499,7 +499,7 @@ static void do_tunnels_list(struct ip_tunnel_parm *p) continue; type = do_ioctl_get_iftype(name); if (type == -1) { - bb_error_msg("cannot get type of [%s]", name); + bb_error_msg("can't get type of [%s]", name); continue; } if (type != ARPHRD_TUNNEL && type != ARPHRD_IPGRE && type != ARPHRD_SIT) diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c index b4cc8dfa4..9e6467de5 100644 --- a/networking/libiproute/libnetlink.c +++ b/networking/libiproute/libnetlink.c @@ -242,7 +242,7 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, status = sendmsg(rtnl->fd, &msg, 0); if (status < 0) { - bb_perror_msg("cannot talk to rtnetlink"); + bb_perror_msg("can't talk to rtnetlink"); goto ret; } diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c index 3c4ef2c32..246b9e33a 100644 --- a/networking/libiproute/ll_map.c +++ b/networking/libiproute/ll_map.c @@ -193,7 +193,7 @@ int FAST_FUNC xll_name_to_index(const char *name) } /* out:*/ if (ret <= 0) - bb_error_msg_and_die("cannot find device \"%s\"", name); + bb_error_msg_and_die("can't find device '%s'", name); return ret; } diff --git a/networking/nameif.c b/networking/nameif.c index fb31fbfff..36fbb954e 100644 --- a/networking/nameif.c +++ b/networking/nameif.c @@ -92,7 +92,7 @@ static void nameif_parse_selector(ethtable_t *ch, char *selector) lmac = xmalloc(ETH_ALEN); ch->mac = ether_aton_r(selector + (strncmp(selector, "mac=", 4) ? 0 : 4), lmac); if (ch->mac == NULL) - bb_error_msg_and_die("cannot parse %s", selector); + bb_error_msg_and_die("can't parse %s", selector); #if ENABLE_FEATURE_NAMEIF_EXTENDED found_selector++; }; @@ -211,7 +211,7 @@ int nameif_main(int argc, char **argv) if (strcmp(ifr.ifr_name, ch->ifname) != 0) { strcpy(ifr.ifr_newname, ch->ifname); ioctl_or_perror_and_die(ctl_sk, SIOCSIFNAME, &ifr, - "cannot change ifname %s to %s", + "can't change ifname %s to %s", ifr.ifr_name, ch->ifname); } /* Remove list entry of renamed interface */ diff --git a/networking/tc.c b/networking/tc.c index d9636949c..3115a5254 100644 --- a/networking/tc.c +++ b/networking/tc.c @@ -531,7 +531,7 @@ int tc_main(int argc UNUSED_PARAM, char **argv) if (rtnl_dump_request(&rth, obj == OBJ_qdisc ? RTM_GETQDISC : obj == OBJ_class ? RTM_GETTCLASS : RTM_GETTFILTER, &msg, sizeof(msg)) < 0) - bb_simple_perror_msg_and_die("cannot send dump request"); + bb_simple_perror_msg_and_die("can't send dump request"); xrtnl_dump_filter(&rth, obj == OBJ_qdisc ? print_qdisc : obj == OBJ_class ? print_class : print_filter, diff --git a/networking/tcpudp.c b/networking/tcpudp.c index 98a2aa8c0..25b3319ec 100644 --- a/networking/tcpudp.c +++ b/networking/tcpudp.c @@ -251,14 +251,14 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv) if (!cert) cert = "./cert.pem"; if (!key) key = cert; if (matrixSslOpen() < 0) - fatal("cannot initialize ssl"); + fatal("can't initialize ssl"); if (matrixSslReadKeys(&keys, cert, key, 0, ca) < 0) { if (client) - fatal("cannot read cert, key, or ca file"); - fatal("cannot read cert or key file"); + fatal("can't read cert, key, or ca file"); + fatal("can't read cert or key file"); } if (matrixSslNewSession(&ssl, keys, 0, SSL_FLAGS_SERVER) < 0) - fatal("cannot create ssl session"); + fatal("can't create ssl session"); #endif sig_block(SIGCHLD); @@ -425,7 +425,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv) if (opts & OPT_h) { free_me1 = remote_hostname = xmalloc_sockaddr2host_noport(&remote.u.sa); if (!remote_hostname) { - bb_error_msg("cannot look up hostname for %s", remote_addr); + bb_error_msg("can't look up hostname for %s", remote_addr); remote_hostname = remote_addr; } } @@ -441,7 +441,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv) if (!local_hostname) { free_me2 = local_hostname = xmalloc_sockaddr2host_noport(&local.u.sa); if (!local_hostname) - bb_error_msg_and_die("cannot look up hostname for %s", local_addr); + bb_error_msg_and_die("can't look up hostname for %s", local_addr); } /* else: local_hostname is not NULL, but is NOT malloced! */ } diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c index 48158fc43..3df0f39b7 100644 --- a/networking/udhcp/arpping.c +++ b/networking/udhcp/arpping.c @@ -57,7 +57,7 @@ int FAST_FUNC arpping(uint32_t test_nip, } if (setsockopt_broadcast(s) == -1) { - bb_perror_msg("cannot enable bcast on raw socket"); + bb_perror_msg("can't enable bcast on raw socket"); goto ret; } diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index 23292a55d..dc5d9ffe9 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c @@ -77,7 +77,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) /* Create pidfile */ write_pidfile(server_config.pidfile); - /* if (!..) bb_perror_msg("cannot create pidfile %s", pidfile); */ + /* if (!..) bb_perror_msg("can't create pidfile %s", pidfile); */ bb_info_msg("%s (v"BB_VER") started", applet_name); diff --git a/networking/udhcp/options.c b/networking/udhcp/options.c index 38f99196e..10ec4597f 100644 --- a/networking/udhcp/options.c +++ b/networking/udhcp/options.c @@ -255,6 +255,6 @@ int FAST_FUNC add_simple_option(uint8_t *optionptr, uint8_t code, uint32_t data) } } - bb_error_msg("cannot add option 0x%02x", code); + bb_error_msg("can't add option 0x%02x", code); return 0; } diff --git a/networking/udhcp/signalpipe.c b/networking/udhcp/signalpipe.c index a025bd8b5..c181e0e06 100644 --- a/networking/udhcp/signalpipe.c +++ b/networking/udhcp/signalpipe.c @@ -29,7 +29,7 @@ static void signal_handler(int sig) { unsigned char ch = sig; /* use char, avoid dealing with partial writes */ if (write(signal_pipe.wr, &ch, 1) != 1) - bb_perror_msg("cannot send signal"); + bb_perror_msg("can't send signal"); } diff --git a/networking/wget.c b/networking/wget.c index 11d39cb66..8ca6def67 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -626,7 +626,7 @@ int wget_main(int argc UNUSED_PARAM, char **argv) /* Impossible? if ((opt & WGET_OPT_CONTINUE) && !fname_out) - bb_error_msg_and_die("cannot specify continue (-c) without a filename (-O)"); + bb_error_msg_and_die("can't specify continue (-c) without a filename (-O)"); */ /* Determine where to start transfer */ -- cgit v1.2.3