Changeset 441

Timestamp:

08/26/09 18:35:43 (15 years ago)

Author:

bhilburn

Message:

Mostly style fixes. Changing over some fprintf's to use the proper
MACRO.

Files:

• vtcross/trunk/src/service_management_layer/ServiceManagementLayer.cpp (modified) (5 diffs)

vtcross/trunk/src/service_management_layer/ServiceManagementLayer.cpp

@@ -39 +39 @@
 #include <netdb.h>
 #include <fcntl.h>
+#include <sqlite3.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
@@ -47 +48 @@
 #include "tinyxml/tinyxml.h"
 #include "tinyxml/tinystr.h"
-
-#include <sqlite3.h>
 
 #include "vtcross/debug.h"
@@ -84 +83 @@
 bool shellFound;
 
-//Callback function used internally by some of the SQLite3 commands
-int callback(void *notUsed, int argc, char **argv, char **azColName){
-    int i;
-    for(i=0; i<argc; i++){
+/* Callback function used internally by some of the SQLite3 commands */
+int32_t 
+callback(void *notUsed, int32_t argc, char **argv, char **azColName)
+{
+    for(size_t i = 0; i < argc; i++) {
         printf("%s = %s\n", azColName[i], argv[i] ? argv[i] : "NULL");
     }
+
     printf("\n");
     return 0;
 }
 
-
-
 ServiceManagementLayer::ServiceManagementLayer()
 {
     LOG("Creating Service Management Layer.\n");
+
     shellSocketFD = -1;
     numberOfCognitiveEngines = 0;
@@ -105 +105 @@
 }
 
-//Free and clear the DB's associated with this SML in the destructor
-//Note that exiting with an error condition will cause SML to not be destructed,
-// resulting in the DB's staying in memory until the destructor is encountered in future executions
+/* Free and clear the DB's associated with this SML in the destructor.
+ *
+ * Note that exiting with an error condition will cause SML to not be destructed,
+ * resulting in the DB's staying in memory until the destructor is encountered in 
+ * future executions. */
 ServiceManagementLayer::~ServiceManagementLayer()
 {
     char *errorMsg;
+    int32_t rc;         /* sqlite command return code */
+
     _services_DB->command="drop table ";
     _services_DB->command.append(_services_DB->tablename);
-    int rc = sqlite3_exec(_services_DB->db, _services_DB->command.c_str(), callback, 0, &errorMsg);
-    if( rc!=SQLITE_OK && rc!=101 )
-        fprintf(stderr, "ServiceManagementLayer::Destructor services 'drop table' error: %s\n", errorMsg);
+    rc = sqlite3_exec(_services_DB->db, _services_DB->command.c_str(), callback, 0, &errorMsg);
+    if((rc != SQLITE_OK) && (rc != 101))
+        WARNING("ServiceManagementLayer::Destructor services 'drop table' error: %s\n", errorMsg);
+
     _services_DB->command="vacuum";
     rc = sqlite3_exec(_services_DB->db, _services_DB->command.c_str(), callback, 0, &errorMsg);
-    if( rc!=SQLITE_OK && rc!=101 )
-        fprintf(stderr, "ServiceManagementLayer::Destructor services 'vacuum' error: %s\n", errorMsg);
+    if((rc != SQLITE_OK) && (rc != 101))
+        WARNING("ServiceManagementLayer::Destructor services 'vacuum' error: %s\n", errorMsg);
+
     free(_services_DB);
 
@@ -125 +131 @@
     _data_DB->command.append(_data_DB->tablename);
     rc = sqlite3_exec(_data_DB->db, _data_DB->command.c_str(), callback, 0, &errorMsg);
-    if( rc!=SQLITE_OK && rc!=101 )
-        fprintf(stderr, "ServiceManagementLayer::Destructor data 'drop table' error: %s\n", errorMsg);
+    if((rc != SQLITE_OK) && (rc != 101))
+        WARNING("ServiceManagementLayer::Destructor data 'drop table' error: %s\n", errorMsg);
+
     _data_DB->command="vacuum";
     rc = sqlite3_exec(_data_DB->db, _data_DB->command.c_str(), callback, 0, &errorMsg);
-    if( rc!=SQLITE_OK && rc!=101 )
-        fprintf(stderr, "ServiceManagementLayer::Destructor data 'vacuum' error: %s\n", errorMsg);
+    if((rc != SQLITE_OK) && (rc != 101))
+        WARNING("ServiceManagementLayer::Destructor data 'vacuum' error: %s\n", errorMsg);
+
     free(_data_DB);
 }