From 73c571a5fff95d0f50f4fc509c35fedca73122bc Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Mon, 9 Mar 2009 00:12:37 +0000
Subject: *: move get_sock_lsa and xwrite_str to libbb, use where appropriate

function                                             old     new   delta
get_sock_lsa                                           -      72     +72
buffer_fill_and_print                                179     196     +17
parse_expr                                           824     832      +8
read_base64                                          343     348      +5
nameval                                              202     206      +4
fbset_main                                          1694    1698      +4
expand                                              1849    1853      +4
udhcp_send_kernel_packet                             249     252      +3
udhcp_get_option                                     223     222      -1
chat_main                                           1246    1245      -1
pack_gzip                                           1661    1659      -2
doset                                                299     297      -2
bb__parsespent                                       119     117      -2
test_main                                            260     257      -3
qgravechar                                           109     106      -3
tcpudpsvd_main                                      1834    1830      -4
sysctl_display_all                                   589     580      -9
xopen_xwrite_close                                    44      33     -11
prs                                                   30      18     -12
find_main                                            418     406     -12
full_write2_str                                       25      12     -13
adduser_main                                         667     654     -13
evaltreenr                                           817     802     -15
evaltree                                             817     802     -15
tftpd_main                                           526     493     -33
ftpd_main                                           2050    1990     -60
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 7/18 up/down: 117/-211)         Total: -94 bytes

---
 networking/ftpd.c | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'networking/ftpd.c')

diff --git a/networking/ftpd.c b/networking/ftpd.c
index 91cbc17..6289edf 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -107,14 +107,6 @@ struct globals {
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define INIT_G() do { } while (0)
 
-
-// libbb candidate?
-static void
-xwrite_str(int fd, const char *str)
-{
-	xwrite(fd, str, strlen(str));
-}
-
 static char *
 replace_text(const char *str, const char from, const char *to)
 {
@@ -918,20 +910,6 @@ handle_stou(void)
 }
 #endif /* ENABLE_FEATURE_FTP_WRITE */
 
-/* TODO: libbb candidate (tftp has another copy) */
-static len_and_sockaddr *get_sock_lsa(int s)
-{
-	len_and_sockaddr *lsa;
-	socklen_t len = 0;
-
-	if (getsockname(s, NULL, &len) != 0)
-		return NULL;
-	lsa = xzalloc(LSA_LEN_SIZE + len);
-	lsa->len = len;
-	getsockname(s, &lsa->u.sa, &lsa->len);
-	return lsa;
-}
-
 int ftpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ftpd_main(int argc UNUSED_PARAM, char **argv)
 {
-- 
cgit v1.1