summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-08-20 17:35:13 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-08-20 17:35:13 +0000
commitd591a360d39f9bca3479b913fe4c5773965d18cf (patch)
tree994b43e608bc4640dff7d1bd333938229b874d82 /networking
parent13068a4fdbe558daea85820fec663db3536aacff (diff)
downloadbusybox-w32-d591a360d39f9bca3479b913fe4c5773965d18cf.tar.gz
busybox-w32-d591a360d39f9bca3479b913fe4c5773965d18cf.tar.bz2
busybox-w32-d591a360d39f9bca3479b913fe4c5773965d18cf.zip
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------ r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines - use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert. - use xchdir() since all is invain if it fails there anyways, supposedly ------------------------------------------------------------------------ r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines - adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account. ------------------------------------------------------------------------ r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines - partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save s 144 bytes text data bss dec hex filename 862434 10156 645924 1518514 172bb2 busybox.old 862322 10156 645892 1518370 172b22 busybox function old new delta z_len 4 - -4 textend 4 - -4 part_nb 4 - -4 insize 4 - -4 ifile_size 4 - -4 do_link 4 - -4 new_text 70 60 -10 ipaddr_list_link 33 23 -10 gzip_main 898 822 -76 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes ------------------------------------------------------------------------ r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines - remove useless global exports function old new delta rpm_main 940 1601 +661 rpm_getstring 107 112 +5 rpm_getint 148 153 +5 loop_through_files 103 106 +3 fileaction_dobackup 115 113 -2 fileaction_list 5 - -5 rpm_getcount 42 - -42 extract_cpio_gz 161 - -161 rpm_gettags 504 - -504 ------------------------------------------------------------------------------ (add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes text data bss dec hex filename 862322 10156 645892 1518370 172b22 busybox.old 862290 10156 645892 1518338 172b02 busybox ------------------------------------------------------------------------ r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines - shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s emaphore stuff into single caller manually. stats: function old new delta logMessage 395 427 +32 message 1245 1257 +12 opts - 4 +4 small 1 - -1 local_logging 4 - -4 doRemoteLog 4 - -4 circular_logging 4 - -4 syslogd_main 1299 1285 -14 static.res 36 16 -20 .rodata 186650 186586 -64 static.line 1025 - -1025 ------------------------------------------------------------------------------ (add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,} text data bss dec hex filename 3723 348 5242 9313 2461 sysklogd/syslogd.o.orig 3697 348 4188 8233 2029 sysklogd/syslogd.o ============================================================================== Overall bloatcheck for the changeset mentioned above: function old new delta rpm_main 953 1608 +655 logMessage 395 427 +32 message 1245 1257 +12 opts - 4 +4 rpm_getstring 107 110 +3 rpm_getint 148 151 +3 loop_through_files 103 104 +1 small 1 - -1 fileaction_dobackup 115 113 -2 z_len 4 - -4 textend 4 - -4 part_nb 4 - -4 local_logging 4 - -4 insize 4 - -4 ifile_size 4 - -4 do_link 4 - -4 doRemoteLog 4 - -4 circular_logging 4 - -4 fileaction_list 5 - -5 new_text 70 60 -10 ipaddr_list_link 33 23 -10 clear_bufs 31 21 -10 syslogd_main 1287 1273 -14 builtin_help 190 176 -14 static.res 36 16 -20 builtin_source 229 199 -30 rpm_getcount 42 - -42 gzip_main 842 786 -56 .rodata 227176 227112 -64 lash_main 609 527 -82 busy_loop 3883 3739 -144 extract_cpio_gz 155 - -155 rpm_gettags 501 - -501 static.line 1025 - -1025 ------------------------------------------------------------------------------ (add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
Diffstat (limited to 'networking')
-rw-r--r--networking/inetd.c4
-rw-r--r--networking/libiproute/iplink.c3
2 files changed, 1 insertions, 6 deletions
diff --git a/networking/inetd.c b/networking/inetd.c
index 49ca7a36e..a17d28ebf 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -908,7 +908,6 @@ static void config (int sig ATTRIBUTE_UNUSED)
908{ 908{
909 servtab_t *sep, *cp, **sepp; 909 servtab_t *sep, *cp, **sepp;
910 sigset_t omask; 910 sigset_t omask;
911 int add;
912 size_t n; 911 size_t n;
913 char protoname[10]; 912 char protoname[10];
914 913
@@ -923,7 +922,7 @@ static void config (int sig ATTRIBUTE_UNUSED)
923 for (sep = servtab; sep; sep = sep->se_next) 922 for (sep = servtab; sep; sep = sep->se_next)
924 if (matchconf (sep, cp)) 923 if (matchconf (sep, cp))
925 break; 924 break;
926 add = 0; 925
927 if (sep != 0) { 926 if (sep != 0) {
928 int i; 927 int i;
929 928
@@ -958,7 +957,6 @@ static void config (int sig ATTRIBUTE_UNUSED)
958#endif 957#endif
959 sigprocmask(SIG_UNBLOCK, &omask, NULL); 958 sigprocmask(SIG_UNBLOCK, &omask, NULL);
960 freeconfig (cp); 959 freeconfig (cp);
961 add = 1;
962 } else { 960 } else {
963 sep = enter (cp); 961 sep = enter (cp);
964 } 962 }
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index 1948efe37..d9f28374b 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -29,8 +29,6 @@
29/* take from linux/sockios.h */ 29/* take from linux/sockios.h */
30#define SIOCSIFNAME 0x8923 /* set interface name */ 30#define SIOCSIFNAME 0x8923 /* set interface name */
31 31
32static int do_link;
33
34static int on_off(char *msg) 32static int on_off(char *msg)
35{ 33{
36 bb_error_msg("Error: argument of \"%s\" must be \"on\" or \"off\"", msg); 34 bb_error_msg("Error: argument of \"%s\" must be \"on\" or \"off\"", msg);
@@ -336,7 +334,6 @@ static int do_set(int argc, char **argv)
336static int ipaddr_list_link(int argc, char **argv) 334static int ipaddr_list_link(int argc, char **argv)
337{ 335{
338 preferred_family = AF_PACKET; 336 preferred_family = AF_PACKET;
339 do_link = 1;
340 return ipaddr_list_or_flush(argc, argv, 0); 337 return ipaddr_list_or_flush(argc, argv, 0);
341} 338}
342 339
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-12 16:28:57 +0000