[git commit] bc: G.sbgn and G.send are unused, remove them

Denys Vlasenko vda.linux at googlemail.com
Thu Dec 13 20:17:43 UTC 2018


commit: https://git.busybox.net/busybox/commit/?id=bbcecc4118416390571170868447fd2773a741bd
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
bc_program_index                                      66      64      -2
bc_parse_expr_empty_ok                              1840    1838      -2
dc_main                                              176     168      -8
bc_main                                               73      65      -8
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/4 up/down: 0/-20)             Total: -20 bytes
   text	   data	    bss	    dec	    hex	filename
 980327	    485	   7296	 988108	  f13cc	busybox_old
 980307	    485	   7296	 988088	  f13b8	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 miscutils/bc.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/miscutils/bc.c b/miscutils/bc.c
index 5930caa32..a271a2040 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -717,8 +717,6 @@ struct globals {
 	IF_FEATURE_BC_SIGNALS(smallint ttyin;)
 	IF_FEATURE_CLEAN_UP(smallint exiting;)
 	smallint in_read;
-	char sbgn;
-	char send;
 
 	BcParse prs;
 	BcProgram prog;
@@ -7075,10 +7073,9 @@ static BC_STATUS zbc_vm_stdin(void)
 		while (*string) {
 			char c = *string;
 			if (string == buffer.v || string[-1] != '\\') {
-				// checking applet type is cheaper than accessing sbgn/send
-				if (IS_BC) // bc: sbgn = send = '"'
+				if (IS_BC)
 					str ^= (c == '"');
-				else { // dc: sbgn = '[', send = ']'
+				else {
 					if (c == ']')
 						str -= 1;
 					else if (c == '[')
@@ -7513,7 +7510,6 @@ int bc_main(int argc UNUSED_PARAM, char **argv)
 	int is_tty;
 
 	INIT_G();
-	G.sbgn = G.send = '"';
 
 	is_tty = bc_vm_init("BC_LINE_LENGTH");
 
@@ -7533,8 +7529,6 @@ int dc_main(int argc UNUSED_PARAM, char **argv)
 	int noscript;
 
 	INIT_G();
-	G.sbgn = '[';
-	G.send = ']';
 	/*
 	 * TODO: dc (GNU bc 1.07.1) 1.4.1 seems to use width
 	 * 1 char wider than bc from the same package.


More information about the busybox-cvs mailing list