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

Timestamp:

2011-10-13T06:57:55Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

25696fea

Parents:

1a7756a (diff), 21881bd8 (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 with mainline

File:

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

kernel/generic/src/console/cmd.c

@@ -1177 +1177 @@
                 /* Execute the test */
                 test_quiet = true;
-                const char *ret = test->entry();
+                const char *test_ret = test->entry();
                 
                 /* Update and read thread accounting */
@@ -1185 +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;