core-legacy/concommands.cpp
changeset 689 4065ba5e9155
parent 683 b507295429f9
child 714 966f819588a2
     1.1 --- a/core-legacy/concommands.cpp	Tue Nov 24 08:06:16 2009 -0600
     1.2 +++ b/core-legacy/concommands.cpp	Thu Dec 10 00:59:50 2009 -0600
     1.3 @@ -176,29 +176,24 @@
     1.4  			}
     1.5  
     1.6  			// Display user messages
     1.7 -			if (g_SmmAPI.MsgCacheSuccessful())
     1.8 +			const char *msgname;
     1.9 +			int msgsize;
    1.10 +			int msgcount = g_SmmAPI.GetUserMessageCount();
    1.11 +
    1.12 +			if (msgcount > 0)
    1.13  			{
    1.14 -				const char *msgname;
    1.15 -				int msgsize;
    1.16 -				int msgcount = g_SmmAPI.GetUserMessageCount();
    1.17 -
    1.18 -				if (msgcount > 0)
    1.19 -				{
    1.20 -					CONMSG("  User Messages:  %-32.31s  %-5s  %-5s\n", "Name", "Index", "Size");
    1.21 +				CONMSG("  User Messages:  %-32.31s  %-5s  %-5s\n", "Name", "Index", "Size");
    1.22  
    1.23 -					for (int i = 0; i < msgcount; i++)
    1.24 -					{
    1.25 -						msgname = g_SmmAPI.GetUserMessage(i, &msgsize);
    1.26 -
    1.27 -						CONMSG("                  %-32.31s  %-5d  %-5d\n", msgname, i, msgsize); 
    1.28 -					}
    1.29 +				for (int i = 0; i < msgcount; i++)
    1.30 +				{
    1.31 +					msgname = g_SmmAPI.GetUserMessage(i, &msgsize);
    1.32  
    1.33 -					CONMSG("  %d user message%s in total\n", msgcount, (msgcount > 1) ? "s" : "");
    1.34 -				} else {
    1.35 -					CONMSG("  User Messages: None\n");
    1.36 +					CONMSG("                  %-32.31s  %-5d  %-5d\n", msgname, i, msgsize); 
    1.37  				}
    1.38 +
    1.39 +				CONMSG("  %d user message%s in total\n", msgcount, (msgcount > 1) ? "s" : "");
    1.40  			} else {
    1.41 -				CONMSG("  User Messages: Failed to get list of user messages\n");
    1.42 +				CONMSG("  User Messages: None\n");
    1.43  			}
    1.44  
    1.45  			return;