From 6d6f5f422d5e92f40b4c9b83ee150790d31348bc Mon Sep 17 00:00:00 2001 From: Brian Pow Date: Wed, 21 Feb 2018 20:06:02 +0800 Subject: [PATCH] use PrintAndLogEx() instead of PrintAndLog() --- client/cmdparser.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/client/cmdparser.c b/client/cmdparser.c index 43c6d9c48..f12b4966e 100644 --- a/client/cmdparser.c +++ b/client/cmdparser.c @@ -21,7 +21,7 @@ void CmdsHelp(const command_t Commands[]) { int i = 0; while (Commands[i].Name) { if (!offline || Commands[i].Offline) - PrintAndLog("%-16s %s", Commands[i].Name, Commands[i].Help); + PrintAndLogEx(NORMAL, "%-16s %s", Commands[i].Name, Commands[i].Help); ++i; } } @@ -84,11 +84,11 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) { // First, dump all single commands, which are not a container for // other commands if (markdown) { - printf("|%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description"); - printf("|%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------"); + PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description"); + PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------"); } else { - printf("%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description"); - printf("%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------"); + PrintAndLogEx(NORMAL, "%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description"); + PrintAndLogEx(NORMAL, "%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------"); } while (cmds[i].Name) { @@ -98,19 +98,19 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) { if ( cmds[i].Offline) cmd_offline = "Y"; if (markdown) - printf("|`%s%-*s`|%-*s|`%s`\n", parent, w_cmd-(int)strlen(parent)-2, cmds[i].Name, w_off, cmd_offline, cmds[i].Help); + PrintAndLogEx(NORMAL, "|`%s%-*s`|%-*s|`%s`\n", parent, w_cmd-(int)strlen(parent)-2, cmds[i].Name, w_off, cmd_offline, cmds[i].Help); else - printf("%s%-*s|%-*s|%s\n", parent, w_cmd-(int)strlen(parent), cmds[i].Name, w_off, cmd_offline, cmds[i].Help); + PrintAndLogEx(NORMAL, "%s%-*s|%-*s|%s\n", parent, w_cmd-(int)strlen(parent), cmds[i].Name, w_off, cmd_offline, cmds[i].Help); ++i; } - printf("\n\n"); + PrintAndLogEx(NORMAL, "\n\n"); i = 0; // Then, print the categories. These will go into subsections with their own tables while (cmds[i].Name) { if(cmds[i].Help[0] != '{' && ++i) continue; - printf("### %s%s\n\n %s\n\n", parent, cmds[i].Name, cmds[i].Help); + PrintAndLogEx(NORMAL, "### %s%s\n\n %s\n\n", parent, cmds[i].Name, cmds[i].Help); char currentparent[512] = {0}; snprintf(currentparent, sizeof currentparent, "%s%s ", parent, cmds[i].Name);