summaryrefslogtreecommitdiff
path: root/networking/interface.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-05-29 04:37:28 +0000
committerRob Landley <rob@landley.net>2006-05-29 04:37:28 +0000
commit4e3aff3425e881e641eba8a62e9295f33d1e70e8 (patch)
tree36b6a162fb66418d4ce096531b6bca945bc7016a /networking/interface.c
parent267a0ed9e62a7fe61dcc978040dc5194ca88969e (diff)
downloadbusybox-w32-4e3aff3425e881e641eba8a62e9295f33d1e70e8.tar.gz
busybox-w32-4e3aff3425e881e641eba8a62e9295f33d1e70e8.tar.bz2
busybox-w32-4e3aff3425e881e641eba8a62e9295f33d1e70e8.zip
Remove _().
Diffstat (limited to 'networking/interface.c')
-rw-r--r--networking/interface.c104
1 files changed, 52 insertions, 52 deletions
diff --git a/networking/interface.c b/networking/interface.c
index d97b0422e..3d399be71 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -182,7 +182,7 @@ static char *UNIX_sprint(struct sockaddr *sap, int numeric)
182 static char buf[64]; 182 static char buf[64];
183 183
184 if (sap->sa_family == 0xFFFF || sap->sa_family == 0) 184 if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
185 return safe_strncpy(buf, _("[NONE SET]"), sizeof(buf)); 185 return safe_strncpy(buf, "[NONE SET]", sizeof(buf));
186 return (UNIX_print(sap->sa_data)); 186 return (UNIX_print(sap->sa_data));
187} 187}
188 188
@@ -217,7 +217,7 @@ static char *INET_sprint(struct sockaddr *sap, int numeric)
217 static char buff[128]; 217 static char buff[128];
218 218
219 if (sap->sa_family == 0xFFFF || sap->sa_family == 0) 219 if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
220 return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); 220 return safe_strncpy(buff, "[NONE SET]", sizeof(buff));
221 221
222 if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap, 222 if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap,
223 numeric, 0xffffff00) != 0) 223 numeric, 0xffffff00) != 0)
@@ -233,7 +233,7 @@ static char *INET_sprintmask(struct sockaddr *sap, int numeric,
233 static char buff[128]; 233 static char buff[128];
234 234
235 if (sap->sa_family == 0xFFFF || sap->sa_family == 0) 235 if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
236 return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); 236 return safe_strncpy(buff, "[NONE SET]", sizeof(buff));
237 if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap, 237 if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap,
238 numeric, netmask) != 0) 238 numeric, netmask) != 0)
239 return (NULL); 239 return (NULL);
@@ -353,10 +353,10 @@ static char *INET6_sprint(struct sockaddr *sap, int numeric)
353 static char buff[128]; 353 static char buff[128];
354 354
355 if (sap->sa_family == 0xFFFF || sap->sa_family == 0) 355 if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
356 return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); 356 return safe_strncpy(buff, "[NONE SET]", sizeof(buff));
357 if (INET6_rresolve 357 if (INET6_rresolve
358 (buff, sizeof(buff), (struct sockaddr_in6 *) sap, numeric) != 0) 358 (buff, sizeof(buff), (struct sockaddr_in6 *) sap, numeric) != 0)
359 return safe_strncpy(buff, _("[UNKNOWN]"), sizeof(buff)); 359 return safe_strncpy(buff, "[UNKNOWN]", sizeof(buff));
360 return (buff); 360 return (buff);
361} 361}
362 362
@@ -422,7 +422,7 @@ static char *UNSPEC_sprint(struct sockaddr *sap, int numeric)
422 static char buf[64]; 422 static char buf[64];
423 423
424 if (sap->sa_family == 0xFFFF || sap->sa_family == 0) 424 if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
425 return safe_strncpy(buf, _("[NONE SET]"), sizeof(buf)); 425 return safe_strncpy(buf, "[NONE SET]", sizeof(buf));
426 return (UNSPEC_print((unsigned char *)sap->sa_data)); 426 return (UNSPEC_print((unsigned char *)sap->sa_data));
427} 427}
428 428
@@ -451,15 +451,15 @@ static short sVafinit = 0;
451 451
452static void afinit() 452static void afinit()
453{ 453{
454 unspec_aftype.title = _("UNSPEC"); 454 unspec_aftype.title = "UNSPEC";
455#if HAVE_AFUNIX 455#if HAVE_AFUNIX
456 unix_aftype.title = _("UNIX Domain"); 456 unix_aftype.title = "UNIX Domain";
457#endif 457#endif
458#if HAVE_AFINET 458#if HAVE_AFINET
459 inet_aftype.title = _("DARPA Internet"); 459 inet_aftype.title = "DARPA Internet";
460#endif 460#endif
461#if HAVE_AFINET6 461#if HAVE_AFINET6
462 inet6_aftype.title = _("IPv6"); 462 inet6_aftype.title = "IPv6";
463#endif 463#endif
464 sVafinit = 1; 464 sVafinit = 1;
465} 465}
@@ -486,7 +486,7 @@ static int aftrans_opt(const char *arg)
486 if (strcmp(tmp1, paft->alias)) 486 if (strcmp(tmp1, paft->alias))
487 continue; 487 continue;
488 if (strlen(paft->name) + strlen(afname) + 1 >= sizeof(afname)) { 488 if (strlen(paft->name) + strlen(afname) + 1 >= sizeof(afname)) {
489 bb_error_msg(_("Too many address family arguments.")); 489 bb_error_msg("Too many address family arguments.");
490 return (0); 490 return (0);
491 } 491 }
492 if (paft->flag) 492 if (paft->flag)
@@ -497,7 +497,7 @@ static int aftrans_opt(const char *arg)
497 break; 497 break;
498 } 498 }
499 if (!paft->alias) { 499 if (!paft->alias) {
500 bb_error_msg(_("Unknown address family `%s'."), tmp1); 500 bb_error_msg("Unknown address family `%s'.", tmp1);
501 return (1); 501 return (1);
502 } 502 }
503 tmp1 = tmp2; 503 tmp1 = tmp2;
@@ -560,7 +560,7 @@ static struct aftype *get_aftype(const char *name)
560 afp++; 560 afp++;
561 } 561 }
562 if (strchr(name, ',')) 562 if (strchr(name, ','))
563 bb_error_msg(_("Please don't supply more than one address family.")); 563 bb_error_msg("Only one address family.");
564 return (NULL); 564 return (NULL);
565} 565}
566#endif /* KEEP_UNUSED */ 566#endif /* KEEP_UNUSED */
@@ -627,7 +627,7 @@ static void print_aflist(int type)
627 txt = (*afp)->name; 627 txt = (*afp)->name;
628 if (!txt) 628 if (!txt)
629 txt = ".."; 629 txt = "..";
630 fprintf(stderr, "%s (%s) ", txt, _((*afp)->title)); 630 fprintf(stderr, "%s (%s) ", txt, (*afp)->title);
631 count++; 631 count++;
632 afp++; 632 afp++;
633 } 633 }
@@ -734,7 +734,7 @@ static int sockets_open(int family)
734 sfd = af->fd; 734 sfd = af->fd;
735 } 735 }
736 if (sfd < 0) { 736 if (sfd < 0) {
737 bb_error_msg(_("No usable address families found.")); 737 bb_error_msg("No usable address families found.");
738 } 738 }
739 return sfd; 739 return sfd;
740} 740}
@@ -971,7 +971,7 @@ static int if_readlist_proc(char *target)
971 971
972 fh = fopen(_PATH_PROCNET_DEV, "r"); 972 fh = fopen(_PATH_PROCNET_DEV, "r");
973 if (!fh) { 973 if (!fh) {
974 bb_perror_msg(_("Warning: cannot open %s. Limited output."), _PATH_PROCNET_DEV); 974 bb_perror_msg("Warning: cannot open %s. Limited output.", _PATH_PROCNET_DEV);
975 return if_readconf(); 975 return if_readconf();
976 } 976 }
977 fgets(buf, sizeof buf, fh); /* eat line */ 977 fgets(buf, sizeof buf, fh); /* eat line */
@@ -1116,11 +1116,11 @@ static int do_if_fetch(struct interface *ife)
1116 1116
1117 if (errno == ENODEV) { 1117 if (errno == ENODEV) {
1118 /* Give better error message for this case. */ 1118 /* Give better error message for this case. */
1119 errmsg = _("Device not found"); 1119 errmsg = "Device not found";
1120 } else { 1120 } else {
1121 errmsg = strerror(errno); 1121 errmsg = strerror(errno);
1122 } 1122 }
1123 bb_error_msg(_("%s: error fetching interface information: %s"), 1123 bb_error_msg("%s: error fetching interface information: %s",
1124 ife->name, errmsg); 1124 ife->name, errmsg);
1125 return -1; 1125 return -1;
1126 } 1126 }
@@ -1195,7 +1195,7 @@ static int in_ether(char *bufp, struct sockaddr *sap)
1195 val = c - 'A' + 10; 1195 val = c - 'A' + 10;
1196 else { 1196 else {
1197#ifdef DEBUG 1197#ifdef DEBUG
1198 bb_error_msg(_("in_ether(%s): invalid ether address!\n"), orig); 1198 bb_error_msg("in_ether(%s): invalid ether address!\n", orig);
1199#endif 1199#endif
1200 errno = EINVAL; 1200 errno = EINVAL;
1201 return (-1); 1201 return (-1);
@@ -1212,7 +1212,7 @@ static int in_ether(char *bufp, struct sockaddr *sap)
1212 val >>= 4; 1212 val >>= 4;
1213 else { 1213 else {
1214#ifdef DEBUG 1214#ifdef DEBUG
1215 bb_error_msg(_("in_ether(%s): invalid ether address!"), orig); 1215 bb_error_msg("in_ether(%s): invalid ether address!", orig);
1216#endif 1216#endif
1217 errno = EINVAL; 1217 errno = EINVAL;
1218 return (-1); 1218 return (-1);
@@ -1226,7 +1226,7 @@ static int in_ether(char *bufp, struct sockaddr *sap)
1226 if (*bufp == ':') { 1226 if (*bufp == ':') {
1227#ifdef DEBUG 1227#ifdef DEBUG
1228 if (i == ETH_ALEN) { 1228 if (i == ETH_ALEN) {
1229 bb_error_msg(_("in_ether(%s): trailing : ignored!"), orig); 1229 bb_error_msg("in_ether(%s): trailing : ignored!", orig);
1230 } 1230 }
1231#endif 1231#endif
1232 bufp++; 1232 bufp++;
@@ -1236,7 +1236,7 @@ static int in_ether(char *bufp, struct sockaddr *sap)
1236#ifdef DEBUG 1236#ifdef DEBUG
1237 /* That's it. Any trailing junk? */ 1237 /* That's it. Any trailing junk? */
1238 if ((i == ETH_ALEN) && (*bufp != '\0')) { 1238 if ((i == ETH_ALEN) && (*bufp != '\0')) {
1239 bb_error_msg(_("in_ether(%s): trailing junk!"), orig); 1239 bb_error_msg("in_ether(%s): trailing junk!", orig);
1240 errno = EINVAL; 1240 errno = EINVAL;
1241 return (-1); 1241 return (-1);
1242 } 1242 }
@@ -1265,7 +1265,7 @@ static const struct hwtype ether_hwtype = {
1265/* Start the PPP encapsulation on the file descriptor. */ 1265/* Start the PPP encapsulation on the file descriptor. */
1266static int do_ppp(int fd) 1266static int do_ppp(int fd)
1267{ 1267{
1268 bb_error_msg(_("You cannot start PPP with this program.")); 1268 bb_error_msg("You cannot start PPP with this program.");
1269 return -1; 1269 return -1;
1270} 1270}
1271#endif /* KEEP_UNUSED */ 1271#endif /* KEEP_UNUSED */
@@ -1303,16 +1303,16 @@ static short sVhwinit = 0;
1303 1303
1304static void hwinit() 1304static void hwinit()
1305{ 1305{
1306 loop_hwtype.title = _("Local Loopback"); 1306 loop_hwtype.title = "Local Loopback";
1307 unspec_hwtype.title = _("UNSPEC"); 1307 unspec_hwtype.title = "UNSPEC";
1308#if HAVE_HWETHER 1308#if HAVE_HWETHER
1309 ether_hwtype.title = _("Ethernet"); 1309 ether_hwtype.title = "Ethernet";
1310#endif 1310#endif
1311#if HAVE_HWTUNNEL 1311#if HAVE_HWTUNNEL
1312 tunnel_hwtype.title = _("IPIP Tunnel"); 1312 tunnel_hwtype.title = "IPIP Tunnel";
1313#endif 1313#endif
1314#if HAVE_HWPPP 1314#if HAVE_HWPPP
1315 ppp_hwtype.title = _("Point-to-Point Protocol"); 1315 ppp_hwtype.title = "Point-to-Point Protocol";
1316#endif 1316#endif
1317 sVhwinit = 1; 1317 sVhwinit = 1;
1318} 1318}
@@ -1481,32 +1481,32 @@ static void ife_print(struct interface *ptr)
1481 if (hw == NULL) 1481 if (hw == NULL)
1482 hw = get_hwntype(-1); 1482 hw = get_hwntype(-1);
1483 1483
1484 printf(_("%-9.9s Link encap:%s "), ptr->name, _(hw->title)); 1484 printf("%-9.9s Link encap:%s ", ptr->name, hw->title);
1485 /* For some hardware types (eg Ash, ATM) we don't print the 1485 /* For some hardware types (eg Ash, ATM) we don't print the
1486 hardware address if it's null. */ 1486 hardware address if it's null. */
1487 if (hw->print != NULL && (!(hw_null_address(hw, ptr->hwaddr) && 1487 if (hw->print != NULL && (!(hw_null_address(hw, ptr->hwaddr) &&
1488 hw->suppress_null_addr))) 1488 hw->suppress_null_addr)))
1489 printf(_("HWaddr %s "), hw->print((unsigned char *)ptr->hwaddr)); 1489 printf("HWaddr %s ", hw->print((unsigned char *)ptr->hwaddr));
1490#ifdef IFF_PORTSEL 1490#ifdef IFF_PORTSEL
1491 if (ptr->flags & IFF_PORTSEL) { 1491 if (ptr->flags & IFF_PORTSEL) {
1492 printf(_("Media:%s"), if_port_text[ptr->map.port] /* [0] */); 1492 printf("Media:%s", if_port_text[ptr->map.port] /* [0] */);
1493 if (ptr->flags & IFF_AUTOMEDIA) 1493 if (ptr->flags & IFF_AUTOMEDIA)
1494 printf(_("(auto)")); 1494 printf("(auto)");
1495 } 1495 }
1496#endif 1496#endif
1497 printf("\n"); 1497 printf("\n");
1498 1498
1499#if HAVE_AFINET 1499#if HAVE_AFINET
1500 if (ptr->has_ip) { 1500 if (ptr->has_ip) {
1501 printf(_(" %s addr:%s "), ap->name, 1501 printf(" %s addr:%s ", ap->name,
1502 ap->sprint(&ptr->addr, 1)); 1502 ap->sprint(&ptr->addr, 1));
1503 if (ptr->flags & IFF_POINTOPOINT) { 1503 if (ptr->flags & IFF_POINTOPOINT) {
1504 printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1)); 1504 printf(" P-t-P:%s ", ap->sprint(&ptr->dstaddr, 1));
1505 } 1505 }
1506 if (ptr->flags & IFF_BROADCAST) { 1506 if (ptr->flags & IFF_BROADCAST) {
1507 printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1)); 1507 printf(" Bcast:%s ", ap->sprint(&ptr->broadaddr, 1));
1508 } 1508 }
1509 printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1)); 1509 printf(" Mask:%s\n", ap->sprint(&ptr->netmask, 1));
1510 } 1510 }
1511#endif 1511#endif
1512 1512
@@ -1542,28 +1542,28 @@ static void ife_print(struct interface *ptr)
1542 inet_pton(AF_INET6, addr6, 1542 inet_pton(AF_INET6, addr6,
1543 (struct sockaddr *) &sap.sin6_addr); 1543 (struct sockaddr *) &sap.sin6_addr);
1544 sap.sin6_family = AF_INET6; 1544 sap.sin6_family = AF_INET6;
1545 printf(_(" inet6 addr: %s/%d"), 1545 printf(" inet6 addr: %s/%d",
1546 inet6_aftype.sprint((struct sockaddr *) &sap, 1), 1546 inet6_aftype.sprint((struct sockaddr *) &sap, 1),
1547 plen); 1547 plen);
1548 printf(_(" Scope:")); 1548 printf(" Scope:");
1549 switch (scope & IPV6_ADDR_SCOPE_MASK) { 1549 switch (scope & IPV6_ADDR_SCOPE_MASK) {
1550 case 0: 1550 case 0:
1551 printf(_("Global")); 1551 printf("Global");
1552 break; 1552 break;
1553 case IPV6_ADDR_LINKLOCAL: 1553 case IPV6_ADDR_LINKLOCAL:
1554 printf(_("Link")); 1554 printf("Link");
1555 break; 1555 break;
1556 case IPV6_ADDR_SITELOCAL: 1556 case IPV6_ADDR_SITELOCAL:
1557 printf(_("Site")); 1557 printf("Site");
1558 break; 1558 break;
1559 case IPV6_ADDR_COMPATv4: 1559 case IPV6_ADDR_COMPATv4:
1560 printf(_("Compat")); 1560 printf("Compat");
1561 break; 1561 break;
1562 case IPV6_ADDR_LOOPBACK: 1562 case IPV6_ADDR_LOOPBACK:
1563 printf(_("Host")); 1563 printf("Host");
1564 break; 1564 break;
1565 default: 1565 default:
1566 printf(_("Unknown")); 1566 printf("Unknown");
1567 } 1567 }
1568 printf("\n"); 1568 printf("\n");
1569 } 1569 }
@@ -1576,21 +1576,21 @@ static void ife_print(struct interface *ptr)
1576 /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */ 1576 /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
1577 1577
1578 if (ptr->flags == 0) { 1578 if (ptr->flags == 0) {
1579 printf(_("[NO FLAGS] ")); 1579 printf("[NO FLAGS] ");
1580 } else { 1580 } else {
1581 int i = 0; 1581 int i = 0;
1582 do { 1582 do {
1583 if (ptr->flags & ife_print_flags_mask[i]) { 1583 if (ptr->flags & ife_print_flags_mask[i]) {
1584 printf(_(ife_print_flags_strs[i])); 1584 printf(ife_print_flags_strs[i]);
1585 } 1585 }
1586 } while (ife_print_flags_mask[++i]); 1586 } while (ife_print_flags_mask[++i]);
1587 } 1587 }
1588 1588
1589 /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */ 1589 /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
1590 printf(_(" MTU:%d Metric:%d"), ptr->mtu, ptr->metric ? ptr->metric : 1); 1590 printf(" MTU:%d Metric:%d", ptr->mtu, ptr->metric ? ptr->metric : 1);
1591#ifdef SIOCSKEEPALIVE 1591#ifdef SIOCSKEEPALIVE
1592 if (ptr->outfill || ptr->keepalive) 1592 if (ptr->outfill || ptr->keepalive)
1593 printf(_(" Outfill:%d Keepalive:%d"), ptr->outfill, ptr->keepalive); 1593 printf(" Outfill:%d Keepalive:%d", ptr->outfill, ptr->keepalive);
1594#endif 1594#endif
1595 printf("\n"); 1595 printf("\n");
1596 1596
@@ -1630,17 +1630,17 @@ static void ife_print(struct interface *ptr)
1630 ptr->map.base_addr)) { 1630 ptr->map.base_addr)) {
1631 printf(" "); 1631 printf(" ");
1632 if (ptr->map.irq) 1632 if (ptr->map.irq)
1633 printf(_("Interrupt:%d "), ptr->map.irq); 1633 printf("Interrupt:%d ", ptr->map.irq);
1634 if (ptr->map.base_addr >= 0x100) /* Only print devices using it for 1634 if (ptr->map.base_addr >= 0x100) /* Only print devices using it for
1635 I/O maps */ 1635 I/O maps */
1636 printf(_("Base address:0x%lx "), 1636 printf("Base address:0x%lx ",
1637 (unsigned long) ptr->map.base_addr); 1637 (unsigned long) ptr->map.base_addr);
1638 if (ptr->map.mem_start) { 1638 if (ptr->map.mem_start) {
1639 printf(_("Memory:%lx-%lx "), ptr->map.mem_start, 1639 printf("Memory:%lx-%lx ", ptr->map.mem_start,
1640 ptr->map.mem_end); 1640 ptr->map.mem_end);
1641 } 1641 }
1642 if (ptr->map.dma) 1642 if (ptr->map.dma)
1643 printf(_("DMA chan:%x "), ptr->map.dma); 1643 printf("DMA chan:%x ", ptr->map.dma);
1644 printf("\n"); 1644 printf("\n");
1645 } 1645 }
1646 printf("\n"); 1646 printf("\n");
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-19 20:20:47 +0000