X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..5fac70d2a11be1f48ba3f2005a8df18b4db6b620:/projects/convertor/main.cpp?ds=sidebyside diff --git a/projects/convertor/main.cpp b/projects/convertor/main.cpp index 58ff7fbd..3d08ad2a 100644 --- a/projects/convertor/main.cpp +++ b/projects/convertor/main.cpp @@ -33,7 +33,7 @@ #include #include "common.h" -#include "base_store.h" +#include "store.h" #include "settings.h" #include "conffiles.h" @@ -43,7 +43,7 @@ #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; @@ -54,8 +54,8 @@ int main(int argc, char **argv) { printfd(__FILE__, "Start\n"); -BASE_STORE * fromStore = NULL; -BASE_STORE * toStore = NULL; +STORE * fromStore = NULL; +STORE * toStore = NULL; SETTINGS * settings = NULL; @@ -112,16 +112,16 @@ if (!dst_lh) 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; } -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());