avoid vast number of warnings with clang compiler

[proxmark3-svn] / client / cmdparser.c

diff --git a/client/cmdparser.c b/client/cmdparser.c
index 845915f6450074d00b4c9853b248948a502b6a17..3250899795d92fd47c1b0af1ebcebb7644cc43fd 100644 (file)
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -15,6 +15,7 @@
 #include "cmdparser.h"
 #include "proxmark3.h"
 
 #include "cmdparser.h"
 #include "proxmark3.h"
 

+

 void CmdsHelp(const command_t Commands[])
 {
   if (Commands[0].Name == NULL)
 void CmdsHelp(const command_t Commands[])
 {
   if (Commands[0].Name == NULL)


@@ -28,48 +29,51 @@ void CmdsHelp(const command_t Commands[])
   }
 }
 
   }
 }
 

-void CmdsParse(const command_t Commands[], const char *Cmd)
+
+int CmdsParse(const command_t Commands[], const char *Cmd)

 {
 {

-  if(strcmp( Cmd, "XX_internal_command_dump_XX") == 0)
-  {// Help dump children
-      dumpCommandsRecursive(Commands, 0);
-      return;
-  }
-  if(strcmp( Cmd, "XX_internal_command_dump_markdown_XX") == 0)
-  {// Markdown help dump children
-      dumpCommandsRecursive(Commands, 1);
-      return;
-  }
-  char cmd_name[32];
-  int len = 0;
-  memset(cmd_name, 0, 32);
-  sscanf(Cmd, "%31s%n", cmd_name, &len);
-  int i = 0;
-  while (Commands[i].Name && strcmp(Commands[i].Name, cmd_name))
-    ++i;
+       if(strcmp( Cmd, "XX_internal_command_dump_XX") == 0)
+       {// Help dump children
+               dumpCommandsRecursive(Commands, 0);
+               return 0;
+       }
+       if(strcmp( Cmd, "XX_internal_command_dump_markdown_XX") == 0)
+       {// Markdown help dump children
+               dumpCommandsRecursive(Commands, 1);
+               return 0;
+       }
+       char cmd_name[32];
+       int len = 0;
+       memset(cmd_name, 0, 32);
+       sscanf(Cmd, "%31s%n", cmd_name, &len);
+       int i = 0;
+       while (Commands[i].Name && strcmp(Commands[i].Name, cmd_name))
+               ++i;

 
 

-  /* try to find exactly one prefix-match */
-  if(!Commands[i].Name) {
-    int last_match = 0;
-    int matches = 0;
-
-    for(i=0;Commands[i].Name;i++) {
-      if( !strncmp(Commands[i].Name, cmd_name, strlen(cmd_name)) ) {
-        last_match = i;
-        matches++;
-      }
-    }
-    if(matches == 1) i=last_match;
-  }
+       /* try to find exactly one prefix-match */
+       if(!Commands[i].Name) {
+               int last_match = 0;
+               int matches = 0;

 
 

-  if (Commands[i].Name) {
-    while (Cmd[len] == ' ')
-      ++len;
-    Commands[i].Parse(Cmd + len);
-  } else {
-    // show help for selected hierarchy or if command not recognised
-    CmdsHelp(Commands);
-  }
+               for(i=0;Commands[i].Name;i++) {
+                       if( !strncmp(Commands[i].Name, cmd_name, strlen(cmd_name)) ) {
+                               last_match = i;
+                               matches++;
+                       }
+               }
+               if(matches == 1) i=last_match;
+       }
+
+       if (Commands[i].Name) {
+               while (Cmd[len] == ' ')
+                       ++len;
+       return Commands[i].Parse(Cmd + len);
+       } else {
+               // show help for selected hierarchy or if command not recognised
+               CmdsHelp(Commands);
+       }
+
+       return 0;

 }
 
 char pparent[512] = {0};
 }
 
 char pparent[512] = {0};


@@ -86,8 +90,8 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown)
   // First, dump all single commands, which are not a container for 
   // other commands
   if (markdown) {
   // First, dump all single commands, which are not a container for 
   // other commands
   if (markdown) {

-    printf("command|offline|description\n");
-    printf("-------|-------|-----------\n");
+    printf("|%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
+    printf("|%-*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,"-------","-----------");
   } else {
     printf("%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
     printf("%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------");


@@ -100,7 +104,7 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown)
 
     if ( cmds[i].Offline) cmd_offline = "Y";
     if (markdown)
 
     if ( cmds[i].Offline) cmd_offline = "Y";
     if (markdown)

-      printf("|`%s%s`|%s|`%s`|\n", parent, cmds[i].Name,cmd_offline, cmds[i].Help);
+      printf("|`%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);
     ++i;
     else
       printf("%s%-*s|%-*s|%s\n", parent, w_cmd-(int)strlen(parent), cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
     ++i;