aboutsummaryrefslogtreecommitdiff
path: root/coreutils/expr.c
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils/expr.c')
-rw-r--r--coreutils/expr.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/coreutils/expr.c b/coreutils/expr.c
index 1bdfba004..b247f08db 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -249,7 +249,7 @@ static arith_t arithmetic_common(VALUE *l, VALUE *r, int op)
249 arith_t li, ri; 249 arith_t li, ri;
250 250
251 if (!toarith(l) || !toarith(r)) 251 if (!toarith(l) || !toarith(r))
252 bb_error_msg_and_die("non-numeric argument"); 252 bb_simple_error_msg_and_die("non-numeric argument");
253 li = l->u.i; 253 li = l->u.i;
254 ri = r->u.i; 254 ri = r->u.i;
255 if (op == '+') 255 if (op == '+')
@@ -259,7 +259,7 @@ static arith_t arithmetic_common(VALUE *l, VALUE *r, int op)
259 if (op == '*') 259 if (op == '*')
260 return li * ri; 260 return li * ri;
261 if (ri == 0) 261 if (ri == 0)
262 bb_error_msg_and_die("division by zero"); 262 bb_simple_error_msg_and_die("division by zero");
263 if (op == '/') 263 if (op == '/')
264 return li / ri; 264 return li / ri;
265 return li % ri; 265 return li % ri;
@@ -319,19 +319,19 @@ static VALUE *eval7(void)
319 VALUE *v; 319 VALUE *v;
320 320
321 if (!*G.args) 321 if (!*G.args)
322 bb_error_msg_and_die("syntax error"); 322 bb_simple_error_msg_and_die("syntax error");
323 323
324 if (nextarg("(")) { 324 if (nextarg("(")) {
325 G.args++; 325 G.args++;
326 v = eval(); 326 v = eval();
327 if (!nextarg(")")) 327 if (!nextarg(")"))
328 bb_error_msg_and_die("syntax error"); 328 bb_simple_error_msg_and_die("syntax error");
329 G.args++; 329 G.args++;
330 return v; 330 return v;
331 } 331 }
332 332
333 if (nextarg(")")) 333 if (nextarg(")"))
334 bb_error_msg_and_die("syntax error"); 334 bb_simple_error_msg_and_die("syntax error");
335 335
336 return str_value(*G.args++); 336 return str_value(*G.args++);
337} 337}
@@ -353,7 +353,7 @@ static VALUE *eval6(void)
353 G.args++; /* We have a valid token, so get the next argument. */ 353 G.args++; /* We have a valid token, so get the next argument. */
354 if (key == 1) { /* quote */ 354 if (key == 1) { /* quote */
355 if (!*G.args) 355 if (!*G.args)
356 bb_error_msg_and_die("syntax error"); 356 bb_simple_error_msg_and_die("syntax error");
357 return str_value(*G.args++); 357 return str_value(*G.args++);
358 } 358 }
359 if (key == 2) { /* length */ 359 if (key == 2) { /* length */
@@ -546,11 +546,11 @@ int expr_main(int argc UNUSED_PARAM, char **argv)
546 xfunc_error_retval = 2; /* coreutils compat */ 546 xfunc_error_retval = 2; /* coreutils compat */
547 G.args = argv + 1; 547 G.args = argv + 1;
548 if (*G.args == NULL) { 548 if (*G.args == NULL) {
549 bb_error_msg_and_die("too few arguments"); 549 bb_simple_error_msg_and_die("too few arguments");
550 } 550 }
551 v = eval(); 551 v = eval();
552 if (*G.args) 552 if (*G.args)
553 bb_error_msg_and_die("syntax error"); 553 bb_simple_error_msg_and_die("syntax error");
554 if (v->type == INTEGER) 554 if (v->type == INTEGER)
555 printf("%" PF_REZ "d\n", PF_REZ_TYPE v->u.i); 555 printf("%" PF_REZ "d\n", PF_REZ_TYPE v->u.i);
556 else 556 else