diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-07 22:42:45 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-07 22:42:45 +0200 |
commit | d60752f8c9be5689a249ad518deb38061d4bc45e (patch) | |
tree | 06df5c7e22be59561cbbcd22eb63ff95344fe321 /printutils | |
parent | 8c0708a329618b20089eb9cedbe06522dd25d9be (diff) | |
download | busybox-w32-d60752f8c9be5689a249ad518deb38061d4bc45e.tar.gz busybox-w32-d60752f8c9be5689a249ad518deb38061d4bc45e.tar.bz2 busybox-w32-d60752f8c9be5689a249ad518deb38061d4bc45e.zip |
build system: -fno-builtin-printf
Benefits are: drops reference to out-of-line putchar(), fixes a few cases
of failed string merge.
function old new delta
i2cdump_main 1488 1502 +14
sha256_process_block64 423 433 +10
sendmail_main 1183 1185 +2
list_table 1114 1116 +2
i2cdetect_main 1235 1237 +2
fdisk_main 2852 2854 +2
builtin_type 119 121 +2
unicode_conv_to_printable2 325 324 -1
scan_recursive 380 378 -2
mkfs_minix_main 2687 2684 -3
buffer_fill_and_print 178 169 -9
putchar 152 - -152
------------------------------------------------------------------------------
(add/remove: 0/2 grow/shrink: 7/4 up/down: 34/-167) Total: -133 bytes
text data bss dec hex filename
937788 932 17676 956396 e97ec busybox_old
937564 932 17676 956172 e970c busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'printutils')
-rw-r--r-- | printutils/lpd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/printutils/lpd.c b/printutils/lpd.c index eaf42c08b..c98bbb347 100644 --- a/printutils/lpd.c +++ b/printutils/lpd.c | |||
@@ -200,7 +200,7 @@ int lpd_main(int argc UNUSED_PARAM, char *argv[]) | |||
200 | if (2 != s[0] && 3 != s[0]) | 200 | if (2 != s[0] && 3 != s[0]) |
201 | goto unsupported_cmd; | 201 | goto unsupported_cmd; |
202 | if (spooling & (1 << (s[0]-1))) { | 202 | if (spooling & (1 << (s[0]-1))) { |
203 | printf("Duplicated subcommand\n"); | 203 | puts("Duplicated subcommand"); |
204 | goto err_exit; | 204 | goto err_exit; |
205 | } | 205 | } |
206 | // get filename | 206 | // get filename |
@@ -208,7 +208,7 @@ int lpd_main(int argc UNUSED_PARAM, char *argv[]) | |||
208 | fname = strchr(s, ' '); | 208 | fname = strchr(s, ' '); |
209 | if (!fname) { | 209 | if (!fname) { |
210 | // bad_fname: | 210 | // bad_fname: |
211 | printf("No or bad filename\n"); | 211 | puts("No or bad filename"); |
212 | goto err_exit; | 212 | goto err_exit; |
213 | } | 213 | } |
214 | *fname++ = '\0'; | 214 | *fname++ = '\0'; |
@@ -219,13 +219,13 @@ int lpd_main(int argc UNUSED_PARAM, char *argv[]) | |||
219 | // get length | 219 | // get length |
220 | expected_len = bb_strtou(s + 1, NULL, 10); | 220 | expected_len = bb_strtou(s + 1, NULL, 10); |
221 | if (errno || expected_len < 0) { | 221 | if (errno || expected_len < 0) { |
222 | printf("Bad length\n"); | 222 | puts("Bad length"); |
223 | goto err_exit; | 223 | goto err_exit; |
224 | } | 224 | } |
225 | if (2 == s[0] && expected_len > 16 * 1024) { | 225 | if (2 == s[0] && expected_len > 16 * 1024) { |
226 | // SECURITY: | 226 | // SECURITY: |
227 | // ctrlfile can't be big (we want to read it back later!) | 227 | // ctrlfile can't be big (we want to read it back later!) |
228 | printf("File is too big\n"); | 228 | puts("File is too big"); |
229 | goto err_exit; | 229 | goto err_exit; |
230 | } | 230 | } |
231 | 231 | ||