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

Timestamp:

2011-10-12T20:58:17Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1ccc32f, cff3fb6, dbd54f72

Parents:

32cd37f

git-author:

Jiri Michalec <michy@…> (2011-10-12 20:58:17)

git-committer:

Jakub Jermar <jakub@…> (2011-10-12 20:58:17)

Message:

Fix a variable name conflict.

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;