Revert "Merge remote-tracking branch 'origin/master' into ticket37"

[stg.git] / projects / stargazer / plugins / store / postgresql / postgresql_store.cpp

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
index a9836911b45ffec8e5b15ee377bde607f5f0ca9e..35551c5db1ecf24bd509fe06ad3c4cd1a78e4a1c 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -38,19 +38,16 @@
  *
  */
 
-#include "postgresql_store.h"
-
-#include "postgresql_store_utils.h"
-#include "postgresql_store.h"
-
-#include "stg/module_settings.h"
-#include "stg/plugin_creator.h"
-
 #include <string>
 #include <vector>
 
 #include <libpq-fe.h>
 
+#include "stg/module_settings.h"
+#include "stg/plugin_creator.h"
+#include "postgresql_store_utils.h"
+#include "postgresql_store.h"
+
 namespace
 {
 PLUGIN_CREATOR<POSTGRESQL_STORE> pgsc;
@@ -92,12 +89,13 @@ pthread_mutex_destroy(&mutex);
 int POSTGRESQL_STORE::ParseSettings()
 {
 std::vector<PARAM_VALUE>::iterator i;
+std::string s;
 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {
     if (i->value.empty())
         continue;
-    std::string s = ToLower(i->param);
+    s = ToLower(i->param);
     if (s == "server")
         {
         server = i->value.front();