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>

5 files changed, 13 insertions, 16 deletions

diff --git a/networking/brctl.c b/networking/brctl.c
index f057f9b60..e1f3e6445 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -156,7 +156,7 @@ static int show_bridge(const char *name, int need_hdr)
         else
         if (LONE_CHAR(filedata, '1'))
                 strcpy(filedata, "yes");
-        fputs(filedata, stdout);
+        fputs_stdout(filedata);
 
         /* sfx points past "BR/bridge/", turn it into "BR/brif": */
         sfx[-4] = 'f'; sfx[-3] = '\0';
diff --git a/networking/httpd.c b/networking/httpd.c
index 3cad28921..e6757d943 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -2788,12 +2788,12 @@ int httpd_main(int argc UNUSED_PARAM, char **argv)
                         , &verbose
                 );
         if (opt & OPT_DECODE_URL) {
-                fputs(percent_decode_in_place(url_for_decode, /*strict:*/ 0), stdout);
+                fputs_stdout(percent_decode_in_place(url_for_decode, /*strict:*/ 0));
                 return 0;
         }
 #if ENABLE_FEATURE_HTTPD_ENCODE_URL_STR
         if (opt & OPT_ENCODE_URL) {
-                fputs(encodeString(url_for_encode), stdout);
+                fputs_stdout(encodeString(url_for_encode));
                 return 0;
         }
 #endif
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)
                 printf("%c    link/%s ", _SL_, ll_type_n2a(ifi->ifi_type, b1));
 
                 if (tb[IFLA_ADDRESS]) {
-                        fputs(ll_addr_n2a(RTA_DATA(tb[IFLA_ADDRESS]),
+                        fputs_stdout(ll_addr_n2a(RTA_DATA(tb[IFLA_ADDRESS]),
                                                       RTA_PAYLOAD(tb[IFLA_ADDRESS]),
                                                       ifi->ifi_type,
-                                                      b1, sizeof(b1)), stdout);
+                                                      b1, sizeof(b1)));
                 }
                 if (tb[IFLA_BROADCAST]) {
                         if (ifi->ifi_flags & IFF_POINTOPOINT)
                                 printf(" peer ");
                         else
                                 printf(" brd ");
-                        fputs(ll_addr_n2a(RTA_DATA(tb[IFLA_BROADCAST]),
+                        fputs_stdout(ll_addr_n2a(RTA_DATA(tb[IFLA_BROADCAST]),
                                                       RTA_PAYLOAD(tb[IFLA_BROADCAST]),
                                                       ifi->ifi_type,
-                                                      b1, sizeof(b1)), stdout);
+                                                      b1, sizeof(b1)));
                 }
         }
         bb_putchar('\n');
@@ -307,9 +307,7 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
                 printf("    family %d ", ifa->ifa_family);
 
         if (rta_tb[IFA_LOCAL]) {
-                fputs(rt_addr_n2a(ifa->ifa_family, RTA_DATA(rta_tb[IFA_LOCAL])),
-                        stdout
-                );
+                fputs_stdout(rt_addr_n2a(ifa->ifa_family, RTA_DATA(rta_tb[IFA_LOCAL])));
 
                 if (rta_tb[IFA_ADDRESS] == NULL
                  || 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,
         if (ifa_flags)
                 printf("flags %02x ", ifa_flags);
         if (rta_tb[IFA_LABEL])
-                fputs((char*)RTA_DATA(rta_tb[IFA_LABEL]), stdout);
+                fputs_stdout((char*)RTA_DATA(rta_tb[IFA_LABEL]));
         if (rta_tb[IFA_CACHEINFO]) {
                 struct ifa_cacheinfo *ci = RTA_DATA(rta_tb[IFA_CACHEINFO]);
                 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,
                                 r->rtm_src_len
                         );
                 } else {
-                        fputs(format_host(r->rtm_family,
+                        fputs_stdout(format_host(r->rtm_family,
                                                 RTA_PAYLOAD(tb[RTA_SRC]),
-                                                RTA_DATA(tb[RTA_SRC])),
-                                stdout
+                                                RTA_DATA(tb[RTA_SRC]))
                         );
                 }
         } else if (r->rtm_src_len) {
@@ -178,7 +177,7 @@ static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
                 } else
                         printf("masquerade");
         } else if (r->rtm_type != RTN_UNICAST)
-                fputs(rtnl_rtntype_n2a(r->rtm_type), stdout);
+                fputs_stdout(rtnl_rtntype_n2a(r->rtm_type));
 
         bb_putchar('\n');
         /*fflush_all();*/
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index 1e9405205..19606c58e 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -112,7 +112,7 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
                         printf("%02u:%02u:%02u\n", h, m, (unsigned)expires);
                 } else { /* -a */
                         time_t t = expires_abs;
-                        fputs(ctime(&t), stdout);
+                        fputs_stdout(ctime(&t));
                 }
         }
         /* close(fd); */