emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove _().

Browse Source
This commit is contained in:
Rob Landley 2006-05-29 04:37:28 +00:00
parent 267a0ed9e6
commit 4e3aff3425
1 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
networking/interface.c
View File

@ -182,7 +182,7 @@ static char *UNIX_sprint(struct sockaddr *sap, int numeric)
static char buf[64]; static char buf[64];
if (sap->sa_family == 0xFFFF || sap->sa_family == 0) if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
return safe_strncpy(buf, _("[NONE SET]"), sizeof(buf)); return safe_strncpy(buf, "[NONE SET]", sizeof(buf));
return (UNIX_print(sap->sa_data)); return (UNIX_print(sap->sa_data));
} }
@ -217,7 +217,7 @@ static char *INET_sprint(struct sockaddr *sap, int numeric)
static char buff[128]; static char buff[128];
if (sap->sa_family == 0xFFFF || sap->sa_family == 0) if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); return safe_strncpy(buff, "[NONE SET]", sizeof(buff));
if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap, if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap,
numeric, 0xffffff00) != 0) numeric, 0xffffff00) != 0)
@ -233,7 +233,7 @@ static char *INET_sprintmask(struct sockaddr *sap, int numeric,
static char buff[128]; static char buff[128];
if (sap->sa_family == 0xFFFF || sap->sa_family == 0) if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); return safe_strncpy(buff, "[NONE SET]", sizeof(buff));
if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap, if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap,
numeric, netmask) != 0) numeric, netmask) != 0)
return (NULL); return (NULL);
@ -353,10 +353,10 @@ static char *INET6_sprint(struct sockaddr *sap, int numeric)
static char buff[128]; static char buff[128];
if (sap->sa_family == 0xFFFF || sap->sa_family == 0) if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); return safe_strncpy(buff, "[NONE SET]", sizeof(buff));
if (INET6_rresolve if (INET6_rresolve
(buff, sizeof(buff), (struct sockaddr_in6 *) sap, numeric) != 0) (buff, sizeof(buff), (struct sockaddr_in6 *) sap, numeric) != 0)
return safe_strncpy(buff, _("[UNKNOWN]"), sizeof(buff)); return safe_strncpy(buff, "[UNKNOWN]", sizeof(buff));
return (buff); return (buff);
} }
@ -422,7 +422,7 @@ static char *UNSPEC_sprint(struct sockaddr *sap, int numeric)
static char buf[64]; static char buf[64];
if (sap->sa_family == 0xFFFF || sap->sa_family == 0) if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
return safe_strncpy(buf, _("[NONE SET]"), sizeof(buf)); return safe_strncpy(buf, "[NONE SET]", sizeof(buf));
return (UNSPEC_print((unsigned char *)sap->sa_data)); return (UNSPEC_print((unsigned char *)sap->sa_data));
} }
@ -451,15 +451,15 @@ static short sVafinit = 0;
static void afinit() static void afinit()
{ {
unspec_aftype.title = _("UNSPEC"); unspec_aftype.title = "UNSPEC";
#if HAVE_AFUNIX #if HAVE_AFUNIX
unix_aftype.title = _("UNIX Domain"); unix_aftype.title = "UNIX Domain";
#endif #endif
#if HAVE_AFINET #if HAVE_AFINET
inet_aftype.title = _("DARPA Internet"); inet_aftype.title = "DARPA Internet";
#endif #endif
#if HAVE_AFINET6 #if HAVE_AFINET6
inet6_aftype.title = _("IPv6"); inet6_aftype.title = "IPv6";
#endif #endif
sVafinit = 1; sVafinit = 1;
} }
@ -486,7 +486,7 @@ static int aftrans_opt(const char *arg)
if (strcmp(tmp1, paft->alias)) if (strcmp(tmp1, paft->alias))
continue; continue;
if (strlen(paft->name) + strlen(afname) + 1 >= sizeof(afname)) { if (strlen(paft->name) + strlen(afname) + 1 >= sizeof(afname)) {
bb_error_msg(_("Too many address family arguments.")); bb_error_msg("Too many address family arguments.");
return (0); return (0);
} }
if (paft->flag) if (paft->flag)
@ -497,7 +497,7 @@ static int aftrans_opt(const char *arg)
break; break;
} }
if (!paft->alias) { if (!paft->alias) {
bb_error_msg(_("Unknown address family `%s'."), tmp1); bb_error_msg("Unknown address family `%s'.", tmp1);
return (1); return (1);
} }
tmp1 = tmp2; tmp1 = tmp2;
@ -560,7 +560,7 @@ static struct aftype *get_aftype(const char *name)
afp++; afp++;
} }
if (strchr(name, ',')) if (strchr(name, ','))
bb_error_msg(_("Please don't supply more than one address family.")); bb_error_msg("Only one address family.");
return (NULL); return (NULL);
} }
#endif /* KEEP_UNUSED */ #endif /* KEEP_UNUSED */
@ -627,7 +627,7 @@ static void print_aflist(int type)
txt = (*afp)->name; txt = (*afp)->name;
if (!txt) if (!txt)
txt = ".."; txt = "..";
fprintf(stderr, "%s (%s) ", txt, _((*afp)->title)); fprintf(stderr, "%s (%s) ", txt, (*afp)->title);
count++; count++;
afp++; afp++;
} }
@ -734,7 +734,7 @@ static int sockets_open(int family)
sfd = af->fd; sfd = af->fd;
} }
if (sfd < 0) { if (sfd < 0) {
bb_error_msg(_("No usable address families found.")); bb_error_msg("No usable address families found.");
} }
return sfd; return sfd;
} }
@ -971,7 +971,7 @@ static int if_readlist_proc(char *target)
fh = fopen(_PATH_PROCNET_DEV, "r"); fh = fopen(_PATH_PROCNET_DEV, "r");
if (!fh) { if (!fh) {
bb_perror_msg(_("Warning: cannot open %s. Limited output."), _PATH_PROCNET_DEV); bb_perror_msg("Warning: cannot open %s. Limited output.", _PATH_PROCNET_DEV);
return if_readconf(); return if_readconf();
} }
fgets(buf, sizeof buf, fh); /* eat line */ fgets(buf, sizeof buf, fh); /* eat line */
@ -1116,11 +1116,11 @@ static int do_if_fetch(struct interface *ife)
if (errno == ENODEV) { if (errno == ENODEV) {
/* Give better error message for this case. */ /* Give better error message for this case. */
errmsg = _("Device not found"); errmsg = "Device not found";
} else { } else {
errmsg = strerror(errno); errmsg = strerror(errno);
} }
bb_error_msg(_("%s: error fetching interface information: %s"), bb_error_msg("%s: error fetching interface information: %s",
ife->name, errmsg); ife->name, errmsg);
return -1; return -1;
} }
@ -1195,7 +1195,7 @@ static int in_ether(char *bufp, struct sockaddr *sap)
val = c - 'A' + 10; val = c - 'A' + 10;
else { else {
#ifdef DEBUG #ifdef DEBUG
bb_error_msg(_("in_ether(%s): invalid ether address!\n"), orig); bb_error_msg("in_ether(%s): invalid ether address!\n", orig);
#endif #endif
errno = EINVAL; errno = EINVAL;
return (-1); return (-1);
@ -1212,7 +1212,7 @@ static int in_ether(char *bufp, struct sockaddr *sap)
val >>= 4; val >>= 4;
else { else {
#ifdef DEBUG #ifdef DEBUG
bb_error_msg(_("in_ether(%s): invalid ether address!"), orig); bb_error_msg("in_ether(%s): invalid ether address!", orig);
#endif #endif
errno = EINVAL; errno = EINVAL;
return (-1); return (-1);
@ -1226,7 +1226,7 @@ static int in_ether(char *bufp, struct sockaddr *sap)
if (*bufp == ':') { if (*bufp == ':') {
#ifdef DEBUG #ifdef DEBUG
if (i == ETH_ALEN) { if (i == ETH_ALEN) {
bb_error_msg(_("in_ether(%s): trailing : ignored!"), orig); bb_error_msg("in_ether(%s): trailing : ignored!", orig);
} }
#endif #endif
bufp++; bufp++;
@ -1236,7 +1236,7 @@ static int in_ether(char *bufp, struct sockaddr *sap)
#ifdef DEBUG #ifdef DEBUG
/* That's it. Any trailing junk? */ /* That's it. Any trailing junk? */
if ((i == ETH_ALEN) && (*bufp != '\0')) { if ((i == ETH_ALEN) && (*bufp != '\0')) {
bb_error_msg(_("in_ether(%s): trailing junk!"), orig); bb_error_msg("in_ether(%s): trailing junk!", orig);
errno = EINVAL; errno = EINVAL;
return (-1); return (-1);
} }
@ -1265,7 +1265,7 @@ static const struct hwtype ether_hwtype = {
/* Start the PPP encapsulation on the file descriptor. */ /* Start the PPP encapsulation on the file descriptor. */
static int do_ppp(int fd) static int do_ppp(int fd)
{ {
bb_error_msg(_("You cannot start PPP with this program.")); bb_error_msg("You cannot start PPP with this program.");
return -1; return -1;
} }
#endif /* KEEP_UNUSED */ #endif /* KEEP_UNUSED */
@ -1303,16 +1303,16 @@ static short sVhwinit = 0;
static void hwinit() static void hwinit()
{ {
loop_hwtype.title = _("Local Loopback"); loop_hwtype.title = "Local Loopback";
unspec_hwtype.title = _("UNSPEC"); unspec_hwtype.title = "UNSPEC";
#if HAVE_HWETHER #if HAVE_HWETHER
ether_hwtype.title = _("Ethernet"); ether_hwtype.title = "Ethernet";
#endif #endif
#if HAVE_HWTUNNEL #if HAVE_HWTUNNEL
tunnel_hwtype.title = _("IPIP Tunnel"); tunnel_hwtype.title = "IPIP Tunnel";
#endif #endif
#if HAVE_HWPPP #if HAVE_HWPPP
ppp_hwtype.title = _("Point-to-Point Protocol"); ppp_hwtype.title = "Point-to-Point Protocol";
#endif #endif
sVhwinit = 1; sVhwinit = 1;
} }
@ -1481,32 +1481,32 @@ static void ife_print(struct interface *ptr)
if (hw == NULL) if (hw == NULL)
hw = get_hwntype(-1); hw = get_hwntype(-1);
printf(_("%-9.9s Link encap:%s "), ptr->name, _(hw->title)); printf("%-9.9s Link encap:%s ", ptr->name, hw->title);
/* For some hardware types (eg Ash, ATM) we don't print the /* For some hardware types (eg Ash, ATM) we don't print the
hardware address if it's null. */ hardware address if it's null. */
if (hw->print != NULL && (!(hw_null_address(hw, ptr->hwaddr) && if (hw->print != NULL && (!(hw_null_address(hw, ptr->hwaddr) &&
hw->suppress_null_addr))) hw->suppress_null_addr)))
printf(_("HWaddr %s "), hw->print((unsigned char *)ptr->hwaddr)); printf("HWaddr %s ", hw->print((unsigned char *)ptr->hwaddr));
#ifdef IFF_PORTSEL #ifdef IFF_PORTSEL
if (ptr->flags & IFF_PORTSEL) { if (ptr->flags & IFF_PORTSEL) {
printf(_("Media:%s"), if_port_text[ptr->map.port] /* [0] */); printf("Media:%s", if_port_text[ptr->map.port] /* [0] */);
if (ptr->flags & IFF_AUTOMEDIA) if (ptr->flags & IFF_AUTOMEDIA)
printf(_("(auto)")); printf("(auto)");
} }
#endif #endif
printf("\n"); printf("\n");
#if HAVE_AFINET #if HAVE_AFINET
if (ptr->has_ip) { if (ptr->has_ip) {
printf(_(" %s addr:%s "), ap->name, printf(" %s addr:%s ", ap->name,
ap->sprint(&ptr->addr, 1)); ap->sprint(&ptr->addr, 1));
if (ptr->flags & IFF_POINTOPOINT) { if (ptr->flags & IFF_POINTOPOINT) {
printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1)); printf(" P-t-P:%s ", ap->sprint(&ptr->dstaddr, 1));
} }
if (ptr->flags & IFF_BROADCAST) { if (ptr->flags & IFF_BROADCAST) {
printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1)); printf(" Bcast:%s ", ap->sprint(&ptr->broadaddr, 1));
} }
printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1)); printf(" Mask:%s\n", ap->sprint(&ptr->netmask, 1));
} }
#endif #endif
@ -1542,28 +1542,28 @@ static void ife_print(struct interface *ptr)
inet_pton(AF_INET6, addr6, inet_pton(AF_INET6, addr6,
(struct sockaddr *) &sap.sin6_addr); (struct sockaddr *) &sap.sin6_addr);
sap.sin6_family = AF_INET6; sap.sin6_family = AF_INET6;
printf(_(" inet6 addr: %s/%d"), printf(" inet6 addr: %s/%d",
inet6_aftype.sprint((struct sockaddr *) &sap, 1), inet6_aftype.sprint((struct sockaddr *) &sap, 1),
plen); plen);
printf(_(" Scope:")); printf(" Scope:");
switch (scope & IPV6_ADDR_SCOPE_MASK) { switch (scope & IPV6_ADDR_SCOPE_MASK) {
case 0: case 0:
printf(_("Global")); printf("Global");
break; break;
case IPV6_ADDR_LINKLOCAL: case IPV6_ADDR_LINKLOCAL:
printf(_("Link")); printf("Link");
break; break;
case IPV6_ADDR_SITELOCAL: case IPV6_ADDR_SITELOCAL:
printf(_("Site")); printf("Site");
break; break;
case IPV6_ADDR_COMPATv4: case IPV6_ADDR_COMPATv4:
printf(_("Compat")); printf("Compat");
break; break;
case IPV6_ADDR_LOOPBACK: case IPV6_ADDR_LOOPBACK:
printf(_("Host")); printf("Host");
break; break;
default: default:
printf(_("Unknown")); printf("Unknown");
} }
printf("\n"); printf("\n");
} }
@ -1576,21 +1576,21 @@ static void ife_print(struct interface *ptr)
/* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */ /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
if (ptr->flags == 0) { if (ptr->flags == 0) {
printf(_("[NO FLAGS] ")); printf("[NO FLAGS] ");
} else { } else {
int i = 0; int i = 0;
do { do {
if (ptr->flags & ife_print_flags_mask[i]) { if (ptr->flags & ife_print_flags_mask[i]) {
printf(_(ife_print_flags_strs[i])); printf(ife_print_flags_strs[i]);
} }
} while (ife_print_flags_mask[++i]); } while (ife_print_flags_mask[++i]);
} }
/* DONT FORGET TO ADD THE FLAGS IN ife_print_short */ /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
printf(_(" MTU:%d Metric:%d"), ptr->mtu, ptr->metric ? ptr->metric : 1); printf(" MTU:%d Metric:%d", ptr->mtu, ptr->metric ? ptr->metric : 1);
#ifdef SIOCSKEEPALIVE #ifdef SIOCSKEEPALIVE
if (ptr->outfill || ptr->keepalive) if (ptr->outfill || ptr->keepalive)
printf(_(" Outfill:%d Keepalive:%d"), ptr->outfill, ptr->keepalive); printf(" Outfill:%d Keepalive:%d", ptr->outfill, ptr->keepalive);
#endif #endif
printf("\n"); printf("\n");
@ -1630,17 +1630,17 @@ static void ife_print(struct interface *ptr)
ptr->map.base_addr)) { ptr->map.base_addr)) {
printf(" "); printf(" ");
if (ptr->map.irq) if (ptr->map.irq)
printf(_("Interrupt:%d "), ptr->map.irq); printf("Interrupt:%d ", ptr->map.irq);
if (ptr->map.base_addr >= 0x100) /* Only print devices using it for if (ptr->map.base_addr >= 0x100) /* Only print devices using it for
I/O maps */ I/O maps */
printf(_("Base address:0x%lx "), printf("Base address:0x%lx ",
(unsigned long) ptr->map.base_addr); (unsigned long) ptr->map.base_addr);
if (ptr->map.mem_start) { if (ptr->map.mem_start) {
printf(_("Memory:%lx-%lx "), ptr->map.mem_start, printf("Memory:%lx-%lx ", ptr->map.mem_start,
ptr->map.mem_end); ptr->map.mem_end);
} }
if (ptr->map.dma) if (ptr->map.dma)
printf(_("DMA chan:%x "), ptr->map.dma); printf("DMA chan:%x ", ptr->map.dma);
printf("\n"); printf("\n");
} }
printf("\n"); printf("\n");