[git commit master 1/1] xargs: trivial code shrink

Denys Vlasenko vda.linux at googlemail.com
Tue Jun 15 08:02:04 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=f7e929e795c433014f76e4be808776e6dc968cbc
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
xargs_main                                           807     787     -20

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 findutils/xargs.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/findutils/xargs.c b/findutils/xargs.c
index 5c26685..d9f8a3b 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;
 			}
-- 
1.7.1



More information about the busybox-cvs mailing list