aboutsummaryrefslogtreecommitdiff
path: root/networking/libiproute
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2021-02-03 20:47:14 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2021-02-03 20:52:40 +0100
commitcad3fc743aa7c7744e4fcf044371f0fda50fa51f (patch)
tree30b1de29e61ed3b5975d183b1746516b7abdc88f /networking/libiproute
parent6ad38d66d08a2646c6423b967a790656ae026c95 (diff)
downloadbusybox-w32-cad3fc743aa7c7744e4fcf044371f0fda50fa51f.tar.gz
busybox-w32-cad3fc743aa7c7744e4fcf044371f0fda50fa51f.tar.bz2
busybox-w32-cad3fc743aa7c7744e4fcf044371f0fda50fa51f.zip
libbb: introduce and use fputs_stdout
function old new delta fputs_stdout - 12 +12 zxc_vm_process 7237 7230 -7 yes_main 85 78 -7 write_block 380 373 -7 wrapf 305 298 -7 strings_main 437 430 -7 show_bridge 353 346 -7 rev_main 384 377 -7 put_prompt_custom 58 51 -7 put_cur_glyph_and_inc_cursor 168 161 -7 print_numbered_lines 152 145 -7 print_named_ascii 130 123 -7 print_name 135 128 -7 print_login_issue 386 379 -7 print_ascii 208 201 -7 powertop_main 1249 1242 -7 od_main 1789 1782 -7 logread_main 518 511 -7 head_main 804 797 -7 display_process_list 1319 1312 -7 cut_main 1002 995 -7 bb_dump_dump 1550 1543 -7 bb_ask_noecho 393 386 -7 baseNUM_main 702 695 -7 expand_main 755 745 -10 dumpleases_main 497 487 -10 write1 12 - -12 putcsi 37 23 -14 print_login_prompt 55 41 -14 paste_main 525 511 -14 cat_main 440 426 -14 print_it 245 230 -15 print_addrinfo 1188 1171 -17 print_rule 770 750 -20 print_linkinfo 842 822 -20 httpd_main 791 771 -20 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 0/34 up/down: 12/-341) Total: -329 bytes Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/libiproute')
-rw-r--r--networking/libiproute/ipaddress.c14
-rw-r--r--networking/libiproute/iprule.c7
2 files changed, 9 insertions, 12 deletions
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index dfd84c000..17a838411 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -192,20 +192,20 @@ static NOINLINE int print_linkinfo(const struct nlmsghdr *n)
192 printf("%c link/%s ", _SL_, ll_type_n2a(ifi->ifi_type, b1)); 192 printf("%c link/%s ", _SL_, ll_type_n2a(ifi->ifi_type, b1));
193 193
194 if (tb[IFLA_ADDRESS]) { 194 if (tb[IFLA_ADDRESS]) {
195 fputs(ll_addr_n2a(RTA_DATA(tb[IFLA_ADDRESS]), 195 fputs_stdout(ll_addr_n2a(RTA_DATA(tb[IFLA_ADDRESS]),
196 RTA_PAYLOAD(tb[IFLA_ADDRESS]), 196 RTA_PAYLOAD(tb[IFLA_ADDRESS]),
197 ifi->ifi_type, 197 ifi->ifi_type,
198 b1, sizeof(b1)), stdout); 198 b1, sizeof(b1)));
199 } 199 }
200 if (tb[IFLA_BROADCAST]) { 200 if (tb[IFLA_BROADCAST]) {
201 if (ifi->ifi_flags & IFF_POINTOPOINT) 201 if (ifi->ifi_flags & IFF_POINTOPOINT)
202 printf(" peer "); 202 printf(" peer ");
203 else 203 else
204 printf(" brd "); 204 printf(" brd ");
205 fputs(ll_addr_n2a(RTA_DATA(tb[IFLA_BROADCAST]), 205 fputs_stdout(ll_addr_n2a(RTA_DATA(tb[IFLA_BROADCAST]),
206 RTA_PAYLOAD(tb[IFLA_BROADCAST]), 206 RTA_PAYLOAD(tb[IFLA_BROADCAST]),
207 ifi->ifi_type, 207 ifi->ifi_type,
208 b1, sizeof(b1)), stdout); 208 b1, sizeof(b1)));
209 } 209 }
210 } 210 }
211 bb_putchar('\n'); 211 bb_putchar('\n');
@@ -307,9 +307,7 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
307 printf(" family %d ", ifa->ifa_family); 307 printf(" family %d ", ifa->ifa_family);
308 308
309 if (rta_tb[IFA_LOCAL]) { 309 if (rta_tb[IFA_LOCAL]) {
310 fputs(rt_addr_n2a(ifa->ifa_family, RTA_DATA(rta_tb[IFA_LOCAL])), 310 fputs_stdout(rt_addr_n2a(ifa->ifa_family, RTA_DATA(rta_tb[IFA_LOCAL])));
311 stdout
312 );
313 311
314 if (rta_tb[IFA_ADDRESS] == NULL 312 if (rta_tb[IFA_ADDRESS] == NULL
315 || memcmp(RTA_DATA(rta_tb[IFA_ADDRESS]), RTA_DATA(rta_tb[IFA_LOCAL]), 4) == 0 313 || memcmp(RTA_DATA(rta_tb[IFA_ADDRESS]), RTA_DATA(rta_tb[IFA_LOCAL]), 4) == 0
@@ -363,7 +361,7 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
363 if (ifa_flags) 361 if (ifa_flags)
364 printf("flags %02x ", ifa_flags); 362 printf("flags %02x ", ifa_flags);
365 if (rta_tb[IFA_LABEL]) 363 if (rta_tb[IFA_LABEL])
366 fputs((char*)RTA_DATA(rta_tb[IFA_LABEL]), stdout); 364 fputs_stdout((char*)RTA_DATA(rta_tb[IFA_LABEL]));
367 if (rta_tb[IFA_CACHEINFO]) { 365 if (rta_tb[IFA_CACHEINFO]) {
368 struct ifa_cacheinfo *ci = RTA_DATA(rta_tb[IFA_CACHEINFO]); 366 struct ifa_cacheinfo *ci = RTA_DATA(rta_tb[IFA_CACHEINFO]);
369 char buf[128]; 367 char buf[128];
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index 50acfe4e7..a23a00d87 100644
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -88,10 +88,9 @@ static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
88 r->rtm_src_len 88 r->rtm_src_len
89 ); 89 );
90 } else { 90 } else {
91 fputs(format_host(r->rtm_family, 91 fputs_stdout(format_host(r->rtm_family,
92 RTA_PAYLOAD(tb[RTA_SRC]), 92 RTA_PAYLOAD(tb[RTA_SRC]),
93 RTA_DATA(tb[RTA_SRC])), 93 RTA_DATA(tb[RTA_SRC]))
94 stdout
95 ); 94 );
96 } 95 }
97 } else if (r->rtm_src_len) { 96 } else if (r->rtm_src_len) {
@@ -178,7 +177,7 @@ static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
178 } else 177 } else
179 printf("masquerade"); 178 printf("masquerade");
180 } else if (r->rtm_type != RTN_UNICAST) 179 } else if (r->rtm_type != RTN_UNICAST)
181 fputs(rtnl_rtntype_n2a(r->rtm_type), stdout); 180 fputs_stdout(rtnl_rtntype_n2a(r->rtm_type));
182 181
183 bb_putchar('\n'); 182 bb_putchar('\n');
184 /*fflush_all();*/ 183 /*fflush_all();*/
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-15 19:05:48 +0000