Changeset 2182

Timestamp:

28/05/2008 16:25:59 (4 years ago)

Author:

chris

Message:

Use symbolic names instead of #defines for return codes.

Location:

box/trunk/bin/bbackupquery

Files:

• BackupQueries.cpp (modified) (19 diffs)
• BackupQueries.h (modified) (1 diff)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -123 +123 @@
                         BOX_WARNING("System command returned error code " <<
                                 result);
-                        SetReturnCode(COMMAND_RETURN_ERROR);
+                        SetReturnCode(ReturnCode::Command_Error);
                 }
                 return;
@@ -296 +296 @@
         {
                 // If not a quit command, set the return code to zero
-                SetReturnCode(0);
+                SetReturnCode(ReturnCode::Command_OK);
         }
 
@@ -411 +411 @@
                         BOX_ERROR("Directory '" << args[0] << "' not found "
                                 "on store.");
-                        SetReturnCode(COMMAND_RETURN_ERROR);
+                        SetReturnCode(ReturnCode::Command_Error);
                         return;
                 }
@@ -449 +449 @@
         {
                 BOX_ERROR("Failed to list directory: " << e.what());
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 return;
         }
@@ -455 +455 @@
         {
                 BOX_ERROR("Failed to list directory: unknown error");
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 return;
         }
@@ -774 +774 @@
         {
                 BOX_ERROR("Incorrect usage. cd [-o] [-d] <directory>");
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 return;
         }
@@ -792 +792 @@
         {
                 BOX_ERROR("Directory '" << args[0] << "' not found.");
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 return;
         }
@@ -814 +814 @@
         {
                 BOX_ERROR("Incorrect usage. lcd <local-directory>");
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 return;
         }
@@ -824 +824 @@
         {
                 BOX_ERROR("Failed to convert path from console encoding.");
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 return;
         }
@@ -843 +843 @@
                 }
 
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 return;
         }
@@ -852 +852 @@
         {
                 BOX_LOG_SYS_ERROR("Error getting current directory");
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 return;
         }
@@ -860 +860 @@
         {
                 BOX_ERROR("Failed to convert new path from console encoding.");
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 return;
         }
@@ -1070 +1070 @@
                 BOX_ERROR("The local file " << localName << " already exists, "
                         "will not overwrite it.");
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 return;
         }
@@ -1269 +1269 @@
                 if (params.mUncheckedFiles != 0)
                 {
-                        SetReturnCode(COMPARE_RETURN_ERROR);
+                        SetReturnCode(ReturnCode::Compare_Error);
                 } 
                 else if (params.mDifferences != 0)
                 {
-                        SetReturnCode(COMPARE_RETURN_DIFFERENT);
+                        SetReturnCode(ReturnCode::Compare_Different);
                 }
                 else
                 {
-                        SetReturnCode(COMPARE_RETURN_SAME);
+                        SetReturnCode(ReturnCode::Compare_Same);
                 }
         }
@@ -2056 +2056 @@
         {
                 BOX_ERROR("Failed to restore: " << e.what());
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 return;
         }
@@ -2062 +2062 @@
         {
                 BOX_ERROR("Failed to restore: unknown exception");
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 return;
         }
@@ -2080 +2080 @@
                 BOX_ERROR("Resume possible -- repeat command with -r flag "
                         "to resume.");
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 break;
         
@@ -2086 +2086 @@
                 BOX_ERROR("The target directory exists. You cannot restore "
                         "over an existing directory.");
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 break;
                 
@@ -2093 +2093 @@
                         "To restore to a directory whose parent "
                         "does not exist, create the parent first.");
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 break;
 
         case Restore_UnknownError:
                 BOX_ERROR("Unknown error during restore.");
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 break;
 
         default:
                 BOX_ERROR("Unknown restore result " << result << ".");
-                SetReturnCode(COMMAND_RETURN_ERROR);
+                SetReturnCode(ReturnCode::Command_Error);
                 break;
         }

box/trunk/bin/bbackupquery/BackupQueries.h

@@ -80 +80 @@
                 box_time_t mLatestFileUploadTime;
         };
-        void CompareLocation(const std::string &rLocation, CompareParams &rParams);
-        void Compare(const std::string &rStoreDir, const std::string &rLocalDir, CompareParams &rParams);
-        void Compare(int64_t DirID, const std::string &rStoreDir, const std::string &rLocalDir, CompareParams &rParams);
+        void CompareLocation(const std::string &rLocation,
+                CompareParams &rParams);
+        void Compare(const std::string &rStoreDir,
+                const std::string &rLocalDir, CompareParams &rParams);
+        void Compare(int64_t DirID, const std::string &rStoreDir,
+                const std::string &rLocalDir, CompareParams &rParams);
+
+public:
+
+        class ReturnCode
+        {
+                public:
+                enum {
+                        Command_OK = 0,
+                        Compare_Same = 1,
+                        Compare_Different,
+                        Compare_Error,
+                        Command_Error,
+                } Type;
+        };
+
+private:
 
         // Utility functions