[incubator-nuttx] branch pr38 updated: sched_mergepending.c: Correct some errors in comments. (#38)

[ac...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

acassis pushed a commit to branch pr38
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/pr38 by this push:
     new 7136215  sched_mergepending.c:  Correct some errors in comments. (#38)
7136215 is described below

commit 7136215930f1b2f3f8790df03a99566dfbd7396e
Author: patacongo <sp...@yahoo.com>
AuthorDate: Sat Jan 4 11:06:44 2020 -0600

    sched_mergepending.c:  Correct some errors in comments. (#38)
    
    * Documentation/NuttXCCodingStandard.html:  Remove requirement to decorate ignored returned values with (void).
    
    * sched_mergepending.c:  Correct some errors in comments.
    
    Co-authored-by: Gregory Nutt <gn...@nuttx.org>
---
 sched/sched/sched_mergepending.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/sched/sched/sched_mergepending.c b/sched/sched/sched_mergepending.c
index a5840f0..3f4acff 100644
--- a/sched/sched/sched_mergepending.c
+++ b/sched/sched/sched_mergepending.c
@@ -76,11 +76,10 @@
  *     a context switch is needed.
  *
  * Assumptions:
- * - The caller has established a critical section before
- *   calling this function (calling sched_lock() first is NOT
- *   a good idea -- use enter_critical_section()).
- * - The caller handles the condition that occurs if the
- *   the head of the sched_mergTSTATE_TASK_PENDINGs is changed.
+ * - The caller has established a critical section before calling this
+ *   function.
+ * - The caller handles the condition that occurs if the head of the
+ *   ready-to-run task list is changed.
  *
  ****************************************************************************/
 
@@ -181,11 +180,10 @@ bool sched_mergepending(void)
  *     a context switch is needed.
  *
  * Assumptions:
- * - The caller has established a critical section before
- *   calling this function (calling sched_lock() first is NOT
- *   a good idea -- use enter_critical_section()).
- * - The caller handles the condition that occurs if the
- *   the head of the sched_mergTSTATE_TASK_PENDINGs is changed.
+ * - The caller has established a critical section before calling this
+ *   function.
+ * - The caller handles the condition that occurs if the head of the
+ *   ready-to-run task list is changed.
  *
  ****************************************************************************/
 
@@ -261,7 +259,7 @@ bool sched_mergepending(void)
                                      (FAR dq_queue_t *)&g_pendingtasks,
                                      TSTATE_TASK_PENDING);
 
-              /* And return with the schedule locked and tasks in the
+              /* And return with the scheduler locked and tasks in the
                * pending task list.
                */