Changeset 8316 in orxonox.OLD for trunk/src/lib/parser/cmdline_parser

Timestamp:

Jun 11, 2006, 1:57:27 PM (19 years ago)

Author:

bensch

Message:

trunk: fixed most -Wall warnings… but there are still many missing :/

Location:

trunk/src/lib/parser/cmdline_parser

Files:

• cmdline_parser.cc (modified) (8 diffs)
• cmdline_parser.h (modified) (2 diffs)

trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc

@@ -52 +52 @@
   else
     argTable.push_front( entry );
+  return true;
 }
 
@@ -70 +71 @@
       if ( s.length() > 2 && s[0] == '-' && s[1] != '-' )
       {
-        for ( int j = 1; j < s.length(); j++ )
+        for (unsigned int j = 1; j < s.length(); j++ )
         {
           std::string t = "-";
@@ -95 +96 @@
   }
 
-  int i = 0;
+  unsigned int i = 0;
 
   ArgTable::iterator it;
@@ -110 +111 @@
         found = true;
 
-        int posArgs = 1;
+        unsigned int posArgs = 1;
 
         while ( i + posArgs < args.size() )
@@ -130 +131 @@
         std::vector<MultiType> argArgs;
 
-        for ( int j = 1; j <= it->numArgs; j++ )
+        for (unsigned int j = 1; j <= it->numArgs; j++ )
           argArgs.push_back( args[i+j] );
 
@@ -219 +220 @@
     assert( it->numArgs == substr.size() );
 
-    for ( int i = 0; i<it->numArgs; i++ )
+    for (unsigned int i = 0; i<it->numArgs; i++ )
     {
       args += " [" + substr[i] + "]";
@@ -251 +252 @@
   output.reverse();
 
-  int maxShort = 0;
-  int maxLong = 0;
+  unsigned int maxShort = 0;
+  unsigned int maxLong = 0;
 
   std::list<std::vector<std::string> >::const_iterator it;
@@ -269 +270 @@
     printf("%s ", (*it)[0].c_str());
 
-    for ( int i = 0; i<maxShort-(*it)[0].length(); i++ )
+    for (unsigned  int i = 0; i<maxShort-(*it)[0].length(); i++ )
       printf(" ");
 
     printf("%s ", (*it)[1].c_str());
 
-    for ( int i = 0; i<maxLong-(*it)[1].length(); i++ )
+    for (unsigned int i = 0; i<maxLong-(*it)[1].length(); i++ )
       printf(" ");
 

trunk/src/lib/parser/cmdline_parser/cmdline_parser.h

@@ -17 +17 @@
 struct ArgTableEntry
 {
-  int         id;
-  std::string longOption;
-  char        shortOption;
-  int         numArgs;
-  std::string argNames;
-  std::string help;
+  unsigned int    id;
+  std::string     longOption;
+  char            shortOption;
+  unsigned int    numArgs;
+  std::string     argNames;
+  std::string     help;
 };
 
@@ -36 +36 @@
     CmdLineParser();
     virtual ~CmdLineParser();
-    
+
     bool add( int id, const std::string& longOption, char shortOption, int numArgs, const std::string & argNames, const std::string& help, bool back=false );
 
     bool parse( ArgParserCallback cb, void* data, int argc, char** argv );
-    
+
     void showHelp();
-    
+
   private:
     ArgTable argTable;
     std::string exeName;
-    
+
     inline bool matches( ArgTableEntry entry, std::string arg, bool & finish );