Changeset b0f00a9 in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/src/console/cmd.c (modified) (5 diffs)

kernel/generic/src/console/cmd.c

@@ -573 +573 @@
         spinlock_lock(&cmd_lock);
         
-        link_t *cur;
         size_t len = 0;
-        for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
+        list_foreach(cmd_list, cur) {
                 cmd_info_t *hlp;
                 hlp = list_get_instance(cur, cmd_info_t, link);
@@ -591 +590 @@
         }
         
-        for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
+        list_foreach(cmd_list, cur) {
                 cmd_info_t *hlp;
                 hlp = list_get_instance(cur, cmd_info_t, link);
@@ -646 +645 @@
 int cmd_desc(cmd_arg_t *argv)
 {
-        link_t *cur;
-        
         spinlock_lock(&cmd_lock);
         
-        for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
+        list_foreach(cmd_list, cur) {
                 cmd_info_t *hlp;
                 
@@ -1180 +1177 @@
                 /* Execute the test */
                 test_quiet = true;
-                const char *ret = test->entry();
+                const char *test_ret = test->entry();
                 
                 /* Update and read thread accounting */
@@ -1188 +1185 @@
                 irq_spinlock_unlock(&TASK->lock, true);
                 
-                if (ret != NULL) {
-                        printf("%s\n", ret);
+                if (test_ret != NULL) {
+                        printf("%s\n", test_ret);
                         ret = false;
                         break;