Changeset 2699 for box/trunk/bin

Timestamp:

06/07/2010 22:05:06 (23 months ago)

Author:

chris

Message:

Fix Windows compile errors.

Location:

box/trunk/bin/bbackupquery

Files:

• BackupQueries.cpp (modified) (2 diffs)
• BackupQueries.h (modified) (1 diff)
• bbackupquery.cpp (modified) (2 diffs)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -200 +200 @@
                 {
                         BOX_ERROR("Failed to convert encoding");
-                        return;
+                        parsed.failed = true;
                 }
                 
@@ -213 +213 @@
                         {
                                 BOX_ERROR("Failed to convert encoding");
-                                return;
+                                parsed.failed = true;
                         }
                         

box/trunk/bin/bbackupquery/BackupQueries.h

@@ -90 +90 @@
                 std::string options;
                 std::string completeCommand;
+                bool failed;
+                ParsedCommand() : failed(false) { }
         };
 

box/trunk/bin/bbackupquery/bbackupquery.cpp

@@ -448 +448 @@
                         BackupQueries::ParsedCommand cmd(
                                 context.ParseCommand(argv[c++], true));
-                        context.DoCommand(cmd);
+
+                        if(cmd.failed)
+                        {
+                                BOX_ERROR("Parse failed");
+                        }
+                        else
+                        {
+                                context.DoCommand(cmd);
+                        }
                 }
         }
@@ -493 +501 @@
                         BackupQueries::ParsedCommand cmd(
                                 context.ParseCommand(command, false));
-                        context.DoCommand(cmd);
                         
+                        if(cmd.failed)
+                        {
+                                BOX_ERROR("Parse failed");
+                        }
+                        else
+                        {
+                                context.DoCommand(cmd);
+                        }
+
                         if(last_cmd != 0 && ::strcmp(last_cmd, command) == 0)
                         {