'err' field moved from private class member to local method variable

[stg.git] / projects / convertor / main.cpp

diff --git a/projects/convertor/main.cpp b/projects/convertor/main.cpp
index 58ff7fbdd9951483b969f25ec674cc0d18db4a61..3d08ad2adeb67e43cd1533f63ee3b32aab751e9c 100644 (file)
--- a/projects/convertor/main.cpp
+++ b/projects/convertor/main.cpp
@@ -33,7 +33,7 @@
 #include <algorithm>
 
 #include "common.h"
 #include <algorithm>
 
 #include "common.h"

-#include "base_store.h"
+#include "store.h"

 #include "settings.h"
 #include "conffiles.h"
 
 #include "settings.h"
 #include "conffiles.h"
 


@@ -43,7 +43,7 @@
 #include "service_conf.h"
 #include "admin_conf.h"
 #include "tariff_conf.h"
 #include "service_conf.h"
 #include "admin_conf.h"
 #include "tariff_conf.h"

-#include "base_settings.h"
+#include "module_settings.h"

 #include "stg_message.h"
 
 using namespace std;
 #include "stg_message.h"
 
 using namespace std;


@@ -54,8 +54,8 @@ int main(int argc, char **argv)
 {
 printfd(__FILE__, "Start\n");
 
 {
 printfd(__FILE__, "Start\n");
 

-BASE_STORE * fromStore = NULL;
-BASE_STORE * toStore = NULL;
+STORE * fromStore = NULL;
+STORE * toStore = NULL;

 
 SETTINGS * settings = NULL;
 
 
 SETTINGS * settings = NULL;
 


@@ -112,16 +112,16 @@ if (!dst_lh)
     return -1;
     }
 
     return -1;
     }
 

-BASE_STORE * (*GetSourceStore)();
-BASE_STORE * (*GetDestStore)();
-GetSourceStore = (BASE_STORE * (*)())dlsym(src_lh, "GetStore");
+STORE * (*GetSourceStore)();
+STORE * (*GetDestStore)();
+GetSourceStore = (STORE * (*)())dlsym(src_lh, "GetStore");

 if (!GetSourceStore)
     {
     printfd(__FILE__, "Source storage plugin loading failed. GetStore not found: %s\n", dlerror());
     delete settings;
     return -1;
     }
 if (!GetSourceStore)
     {
     printfd(__FILE__, "Source storage plugin loading failed. GetStore not found: %s\n", dlerror());
     delete settings;
     return -1;
     }

-GetDestStore = (BASE_STORE * (*)())dlsym(dst_lh, "GetStore");
+GetDestStore = (STORE * (*)())dlsym(dst_lh, "GetStore");

 if (!GetDestStore)
     {
     printfd(__FILE__, "Storage plugin (firebird) loading failed. GetStore not found: %s\n", dlerror());
 if (!GetDestStore)
     {
     printfd(__FILE__, "Storage plugin (firebird) loading failed. GetStore not found: %s\n", dlerror());