From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 15 Jun 2010 08:02:04 +0000 (+0200)
Subject: xargs: trivial code shrink
X-Git-Tag: 1_17_0~79
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f7e929e795c433014f76e4be808776e6dc968cbc;p=oweals%2Fbusybox.git

xargs: trivial code shrink

function                                             old     new   delta
xargs_main                                           807     787     -20

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

diff --git a/findutils/xargs.c b/findutils/xargs.c
index 5c2668553..d9f8a3b18 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -222,10 +222,10 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf)
 					goto ret;
 				}
 			}
-			n_max_chars -= (p - s);
-			/* if (n_max_chars < 0) impossible */
 			store_param(s);
 			dbg_msg("args[]:'%s'", s);
+			n_max_chars -= (p - s);
+			/* if (n_max_chars < 0) impossible */
 			s = p;
 			n_max_arg--;
 			if (n_max_arg == 0 || n_max_chars == 0) {
@@ -276,10 +276,10 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf)
 					goto ret;
 				}
 			}
-			n_max_chars -= (p - s);
-			/* if (n_max_chars < 0) impossible */
 			store_param(s);
 			dbg_msg("args[]:'%s'", s);
+			n_max_chars -= (p - s);
+			/* if (n_max_chars < 0) impossible */
 			s = p;
 			n_max_arg--;
 			if (n_max_arg == 0 || n_max_chars == 0) {
@@ -317,12 +317,12 @@ static char* FAST_FUNC process0_stdin(int n_max_chars, int n_max_arg, char *buf)
 		*p++ = c;
 		if (c == '\0') {   /* word's delimiter or EOF detected */
 			/* A full word is loaded */
-			n_max_chars -= (p - s);
-			/* if (n_max_chars < 0) impossible */
 			store_param(s);
 			dbg_msg("args[]:'%s'", s);
-			n_max_arg--;
+			n_max_chars -= (p - s);
+			/* if (n_max_chars < 0) impossible */
 			s = p;
+			n_max_arg--;
 			if (n_max_arg == 0 || n_max_chars == 0) {
 				goto ret;
 			}