From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sun, 8 Jun 2014 20:56:46 +0000 (+0300)
Subject: Another set of minor fixes.
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/c1095d51e3e3323455ba758ac7ad0b5988c35244?ds=inline;hp=72229403aae25f742c07d07d625bdc1e313b401d
Another set of minor fixes.
---
diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
index d6ff1a3a..8fd23569 100644
--- a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
@@ -127,8 +127,6 @@ STG_LOCKER lock(&mutex, __FILE__, __LINE__);
IBPP::Transaction tr = IBPP::TransactionFactory(db, IBPP::amWrite, til, tlr);
IBPP::Statement st = IBPP::StatementFactory(db, tr);
-int32_t id, i;
-
try
{
tr->Start();
@@ -142,6 +140,7 @@ try
printfd(__FILE__, "Tariff '%s' not found in database\n", tariffName.c_str());
return -1;
}
+ int32_t id;
st->Get(1, id);
st->Close();
if (schemaVersion > 0)
@@ -180,7 +179,7 @@ try
IBPP::Time tb;
IBPP::Time te;
- for(i = 0; i < DIR_NUM; i++)
+ for(int i = 0; i < DIR_NUM; i++)
{
tb.SetTime(td.dirPrice[i].hDay, td.dirPrice[i].mDay, 0);
diff --git a/projects/stargazer/plugins/store/mysql/mysql_store.cpp b/projects/stargazer/plugins/store/mysql/mysql_store.cpp
index 8f64acdf..609c49ea 100644
--- a/projects/stargazer/plugins/store/mysql/mysql_store.cpp
+++ b/projects/stargazer/plugins/store/mysql/mysql_store.cpp
@@ -116,8 +116,7 @@ MYSQL_STORE_SETTINGS::MYSQL_STORE_SETTINGS()
dbUser(),
dbPass(),
dbName(),
- dbHost(),
- schemaVersion(0)
+ dbHost()
{
}
//-----------------------------------------------------------------------------
@@ -164,6 +163,7 @@ MYSQL_STORE::MYSQL_STORE()
version("mysql_store v.0.67"),
storeSettings(),
settings(),
+ schemaVersion(0),
logger(GetPluginLogger(GetStgLogger(), "store_mysql"))
{
}
diff --git a/projects/stargazer/stg_timer.cpp b/projects/stargazer/stg_timer.cpp
index 81128c7a..d39c61db 100644
--- a/projects/stargazer/stg_timer.cpp
+++ b/projects/stargazer/stg_timer.cpp
@@ -1,12 +1,12 @@
-#include <pthread.h>
+#include "stg_timer.h"
+
+#include "stg/common.h"
#include <ctime>
#include <cstring>
#include <csignal>
-#include "stg/common.h"
-
-#include "stg_timer.h"
+#include <pthread.h>
void * StgTimer(void *);
@@ -15,6 +15,7 @@ static pthread_t thrStgTimer;
static bool isTimerRunning = false;
volatile time_t stgTime;
+#ifdef STG_TIMER_DEBUG
const int TIME_SPEED = 1;
/*
1 - 1x speed
@@ -29,6 +30,7 @@ const int START_TIME = 0;
1 - start before new day (3 min before) 29.11.2005 23:57:00
2 - start before new month (3 min before) 30.11.2005 23:57:00
*/
+#endif
//-----------------------------------------------------------------------------
void * StgTimer(void *)