From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 3 Dec 2018 20:46:41 +0000 (+0100)
Subject: bc: convert BC_STATUS_PARSE_NO_AUTO
X-Git-Tag: 1_30_0~317
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=abbc433d29307ee1e42f3a98c55b3d8e75a42350;p=oweals%2Fbusybox.git

bc: convert BC_STATUS_PARSE_NO_AUTO

function                                             old     new   delta
bc_parse_auto                                        275     291     +16
bc_err_msgs                                          172     168      -4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 16/-4)              Total: 12 bytes
   text	   data	    bss	    dec	    hex	filename
 987911	    485	   7296	 995692	  f316c	busybox_old
 987923	    485	   7296	 995704	  f3178	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/miscutils/bc.c b/miscutils/bc.c
index 0d81e13cf..2bde51521 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -189,7 +189,7 @@ typedef enum BcStatus {
 	BC_STATUS_PARSE_BAD_PRINT,
 	BC_STATUS_PARSE_BAD_FUNC,
 	BC_STATUS_PARSE_BAD_ASSIGN,
-	BC_STATUS_PARSE_NO_AUTO,
+//	BC_STATUS_PARSE_NO_AUTO,
 	BC_STATUS_PARSE_DUPLICATE_LOCAL,
 	BC_STATUS_PARSE_NO_BLOCK_END,
 
@@ -261,7 +261,7 @@ static const char *const bc_err_msgs[] = {
 	"bad function definition",
 	"bad assignment: left side must be scale, ibase, "
 		"obase, last, var, or array element",
-	"no auto variable found",
+//	"no auto variable found",
 	"function parameter or auto var has the same name as another",
 	"block end could not be found",
 
@@ -4509,7 +4509,7 @@ static BcStatus bc_parse_auto(BcParse *p)
 	}
 
 	if (comma) return BC_STATUS_PARSE_BAD_FUNC;
-	if (!one) return BC_STATUS_PARSE_NO_AUTO;
+	if (!one) return bc_error("no auto variable found");
 
 	if (p->l.t.t != BC_LEX_NLINE && p->l.t.t != BC_LEX_SCOLON)
 		return BC_STATUS_PARSE_BAD_TOKEN;