Changeset 1790 for box/chris/general/bin/bbackupquery/bbackupquery.cpp

Timestamp:

03/08/2007 00:29:31 (5 years ago)

Author:

chris

Message:

Convert most printf() and fprintf() calls to use logging framework
instead. (merges [1789])

File:

• box/chris/general/bin/bbackupquery/bbackupquery.cpp (modified) (8 diffs)

box/chris/general/bin/bbackupquery/bbackupquery.cpp

@@ -13 +13 @@
         #include <unistd.h>
 #endif
+
+#include <errno.h>
 #include <stdio.h>
-#include <sys/types.h>
+
+#ifdef HAVE_SYS_TYPES_H
+        #include <sys/types.h>
+#endif
+
 #ifdef HAVE_LIBREADLINE
         #ifdef HAVE_READLINE_READLINE_H
@@ -169 +175 @@
                         if(logFile == 0)
                         {
-                                printf("Can't open log file '%s'\n", optarg);
+                                BOX_ERROR("Failed to open log file '" <<
+                                        optarg << "': " << strerror(errno));
                         }
                         break;
@@ -202 +209 @@
                 if (!SetConsoleCP(CP_UTF8))
                 {
-                        fprintf(stderr, "Failed to set input codepage: "
-                                "error %d\n", GetLastError());
+                        BOX_ERROR("Failed to set input codepage: " <<
+                                GetErrorMessage(GetLastError()));
                 }
 
                 if (!SetConsoleOutputCP(CP_UTF8))
                 {
-                        fprintf(stderr, "Failed to set output codepage: "
-                                "error %d\n", GetLastError());
+                        BOX_ERROR("Failed to set output codepage: " <<
+                                GetErrorMessage(GetLastError()));
                 }
 
@@ -223 +230 @@
 
         // Read in the configuration file
-        if(!quiet) printf("Using configuration file %s\n", 
-                configFilename.c_str());
+        if(!quiet) BOX_INFO("Using configuration file " << configFilename);
 
         std::string errs;
@@ -233 +239 @@
         if(config.get() == 0 || !errs.empty())
         {
-                printf("Invalid configuration file:\n%s", errs.c_str());
+                BOX_FATAL("Invalid configuration file: " << errs);
                 return 1;
         }
@@ -253 +259 @@
 
         // 2. Connect to server
-        if(!quiet) printf("Connecting to store...\n");
+        if(!quiet) BOX_INFO("Connecting to store...");
         SocketStreamTLS socket;
         socket.Open(tlsContext, Socket::TypeINET, conf.GetKeyValue("StoreHostname").c_str(), BOX_PORT_BBSTORED);
         
         // 3. Make a protocol, and handshake
-        if(!quiet) printf("Handshake with store...\n");
+        if(!quiet) BOX_INFO("Handshake with store...");
         BackupProtocolClient connection(socket);
         connection.Handshake();
@@ -269 +275 @@
         
         // 4. Log in to server
-        if(!quiet) printf("Login to store...\n");
+        if(!quiet) BOX_INFO("Login to store...");
         // Check the version of the server
         {
@@ -346 +352 @@
         
         // Done... stop nicely
-        if(!quiet) printf("Logging off...\n");
+        if(!quiet) BOX_INFO("Logging off...");
         connection.QueryFinished();
-        if(!quiet) printf("Session finished.\n");
+        if(!quiet) BOX_INFO("Session finished.");
         
         // Return code