From da8ba5dfd52c2bfd12839d5b82794d38344efd50 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 13 Nov 2014 06:27:29 -0600 Subject: [PATCH] Remove use of CONFIG_MASK_TASK_ARGS from NSH --- nshlib/nsh.h | 6 ------ nshlib/nsh_proccmds.c | 6 +----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/nshlib/nsh.h b/nshlib/nsh.h index c06d4e910..d726b5253 100644 --- a/nshlib/nsh.h +++ b/nshlib/nsh.h @@ -454,12 +454,6 @@ # endif #endif -#if defined(CONFIG_NSH_BUILTIN_APPS) || defined(CONFIG_NSH_FILE_APPS) -# if CONFIG_NSH_MAXARGUMENTS > CONFIG_MAX_TASK_ARGS -# warning Number of built-in and file task arguments will be truncated to CONFIG_MAX_TASK_ARGS -# endif -#endif - /* Argument list size * * argv[0]: The command name. diff --git a/nshlib/nsh_proccmds.c b/nshlib/nsh_proccmds.c index 0cbc0f8de..f72d8877f 100644 --- a/nshlib/nsh_proccmds.c +++ b/nshlib/nsh_proccmds.c @@ -236,9 +236,7 @@ static void ps_task(FAR struct tcb_s *tcb, FAR void *arg) char buffer[8]; int ret; #endif -#if CONFIG_MAX_TASK_ARGS > 2 int i; -#endif /* Show task status */ @@ -293,12 +291,10 @@ static void ps_task(FAR struct tcb_s *tcb, FAR void *arg) /* Then any additional arguments */ -#if CONFIG_MAX_TASK_ARGS > 2 - for (i = 2; i <= CONFIG_MAX_TASK_ARGS && ttcb->argv[i]; i++) + for (i = 2; ttcb->argv[i]; i++) { nsh_output(vtbl, ", %p", ttcb->argv[i]); } -#endif } }