Changeset 21881bd8 in mainline


Ignore:
Timestamp:
2011-10-12T20:58:17Z (12 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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/console/cmd.c

    r32cd37f r21881bd8  
    11771177                /* Execute the test */
    11781178                test_quiet = true;
    1179                 const char *ret = test->entry();
     1179                const char *test_ret = test->entry();
    11801180               
    11811181                /* Update and read thread accounting */
     
    11851185                irq_spinlock_unlock(&TASK->lock, true);
    11861186               
    1187                 if (ret != NULL) {
    1188                         printf("%s\n", ret);
     1187                if (test_ret != NULL) {
     1188                        printf("%s\n", test_ret);
    11891189                        ret = false;
    11901190                        break;
Note: See TracChangeset for help on using the changeset viewer.