Use C++03 in cppcheck.

[stg.git] / projects / stargazer / corps_impl.cpp

diff --git a/projects/stargazer/corps_impl.cpp b/projects/stargazer/corps_impl.cpp
index 456523dc500af8250e664584b7daa8252523e452..098acacac1b9f7ec6761d19751b1431b321e3c6d 100644 (file)
--- a/projects/stargazer/corps_impl.cpp
+++ b/projects/stargazer/corps_impl.cpp
@@ -18,13 +18,14 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#include <cerrno>
-#include <cassert>
-#include <algorithm>
+#include "corps_impl.h"

 
 #include "stg/admin.h"
 #include "stg/common.h"
 
 #include "stg/admin.h"
 #include "stg/common.h"

-#include "corps_impl.h"
+
+#include <cerrno>
+#include <cassert>
+#include <algorithm>

 
 //-----------------------------------------------------------------------------
 CORPORATIONS_IMPL::CORPORATIONS_IMPL(STORE * st)
 
 //-----------------------------------------------------------------------------
 CORPORATIONS_IMPL::CORPORATIONS_IMPL(STORE * st)


@@ -33,7 +34,9 @@ CORPORATIONS_IMPL::CORPORATIONS_IMPL(STORE * st)
       store(st),
       WriteServLog(GetStgLogger()),
       searchDescriptors(),
       store(st),
       WriteServLog(GetStgLogger()),
       searchDescriptors(),

-      handle(0)
+      handle(0),
+      mutex(),
+      strError()

 {
 pthread_mutex_init(&mutex, NULL);
 Read();
 {
 pthread_mutex_init(&mutex, NULL);
 Read();


@@ -41,12 +44,12 @@ Read();
 //-----------------------------------------------------------------------------
 int CORPORATIONS_IMPL::Add(const CORP_CONF & corp, const ADMIN * admin)
 {
 //-----------------------------------------------------------------------------
 int CORPORATIONS_IMPL::Add(const CORP_CONF & corp, const ADMIN * admin)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 const PRIV * priv = admin->GetPriv();
 
 if (!priv->corpChg)
     {
 const PRIV * priv = admin->GetPriv();
 
 if (!priv->corpChg)
     {

-    string s = admin->GetLogStr() + " Add corporation \'" + corp.name + "\'. Access denied.";
+    std::string s = admin->GetLogStr() + " Add corporation \'" + corp.name + "\'. Access denied.";

     strError = "Access denied.";
     WriteServLog(s.c_str());
     return -1;
     strError = "Access denied.";
     WriteServLog(s.c_str());
     return -1;


@@ -77,14 +80,14 @@ WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
 return -1;
 }
 //-----------------------------------------------------------------------------
 return -1;
 }
 //-----------------------------------------------------------------------------

-int CORPORATIONS_IMPL::Del(const string & name, const ADMIN * admin)
+int CORPORATIONS_IMPL::Del(const std::string & name, const ADMIN * admin)

 {
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 const PRIV * priv = admin->GetPriv();
 
 if (!priv->corpChg)
     {
 const PRIV * priv = admin->GetPriv();
 
 if (!priv->corpChg)
     {

-    string s = admin->GetLogStr() + " Delete corporation \'" + name + "\'. Access denied.";
+    std::string s = admin->GetLogStr() + " Delete corporation \'" + name + "\'. Access denied.";

     strError = "Access denied.";
     WriteServLog(s.c_str());
     return -1;
     strError = "Access denied.";
     WriteServLog(s.c_str());
     return -1;


@@ -99,13 +102,13 @@ if (si == data.end())
     return -1;
     }
 
     return -1;
     }
 

-map<int, const_crp_iter>::iterator csi;
+std::map<int, const_crp_iter>::iterator csi;

 csi = searchDescriptors.begin();
 while (csi != searchDescriptors.end())
     {
     if (csi->second == si)
         (csi->second)++;
 csi = searchDescriptors.begin();
 while (csi != searchDescriptors.end())
     {
     if (csi->second == si)
         (csi->second)++;

-    csi++;
+    ++csi;

     }
 
 data.remove(*si);
     }
 
 data.remove(*si);


@@ -123,12 +126,12 @@ return 0;
 //-----------------------------------------------------------------------------
 int CORPORATIONS_IMPL::Change(const CORP_CONF & corp, const ADMIN * admin)
 {
 //-----------------------------------------------------------------------------
 int CORPORATIONS_IMPL::Change(const CORP_CONF & corp, const ADMIN * admin)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 const PRIV * priv = admin->GetPriv();
 
 if (!priv->corpChg)
     {
 const PRIV * priv = admin->GetPriv();
 
 if (!priv->corpChg)
     {

-    string s = admin->GetLogStr() + " Change corporation \'" + corp.name + "\'. Access denied.";
+    std::string s = admin->GetLogStr() + " Change corporation \'" + corp.name + "\'. Access denied.";

     strError = "Access denied.";
     WriteServLog(s.c_str());
     return -1;
     strError = "Access denied.";
     WriteServLog(s.c_str());
     return -1;


@@ -159,8 +162,8 @@ return 0;
 //-----------------------------------------------------------------------------
 bool CORPORATIONS_IMPL::Read()
 {
 //-----------------------------------------------------------------------------
 bool CORPORATIONS_IMPL::Read()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-vector<string> corpsList;
+STG_LOCKER lock(&mutex);
+std::vector<std::string> corpsList;

 if (store->GetCorpsList(&corpsList) < 0)
     {
     WriteServLog(store->GetStrError().c_str());
 if (store->GetCorpsList(&corpsList) < 0)
     {
     WriteServLog(store->GetStrError().c_str());


@@ -182,11 +185,11 @@ for (size_t i = 0; i < corpsList.size(); i++)
 return false;
 }
 //-----------------------------------------------------------------------------
 return false;
 }
 //-----------------------------------------------------------------------------

-bool CORPORATIONS_IMPL::Find(const string & name, CORP_CONF * corp)
+bool CORPORATIONS_IMPL::Find(const std::string & name, CORP_CONF * corp)

 {
 assert(corp != NULL && "Pointer to corporation is not null");
 
 {
 assert(corp != NULL && "Pointer to corporation is not null");
 

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (data.empty())
     return false;
 
 if (data.empty())
     return false;
 


@@ -201,9 +204,9 @@ if (si != data.end())
 return true;
 }
 //-----------------------------------------------------------------------------
 return true;
 }
 //-----------------------------------------------------------------------------

-bool CORPORATIONS_IMPL::Exists(const string & name) const
+bool CORPORATIONS_IMPL::Exists(const std::string & name) const

 {
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (data.empty())
     {
     printfd(__FILE__, "no admin in system!\n");
 if (data.empty())
     {
     printfd(__FILE__, "no admin in system!\n");


@@ -220,7 +223,7 @@ return false;
 //-----------------------------------------------------------------------------
 int CORPORATIONS_IMPL::OpenSearch() const
 {
 //-----------------------------------------------------------------------------
 int CORPORATIONS_IMPL::OpenSearch() const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 handle++;
 searchDescriptors[handle] = data.begin();
 return handle;
 handle++;
 searchDescriptors[handle] = data.begin();
 return handle;


@@ -228,7 +231,7 @@ return handle;
 //-----------------------------------------------------------------------------
 int CORPORATIONS_IMPL::SearchNext(int h, CORP_CONF * corp) const
 {
 //-----------------------------------------------------------------------------
 int CORPORATIONS_IMPL::SearchNext(int h, CORP_CONF * corp) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (searchDescriptors.find(h) == searchDescriptors.end())
     {
     WriteServLog("CORPORATIONS. Incorrect search handle.");
 if (searchDescriptors.find(h) == searchDescriptors.end())
     {
     WriteServLog("CORPORATIONS. Incorrect search handle.");


@@ -245,7 +248,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int CORPORATIONS_IMPL::CloseSearch(int h) const
 {
 //-----------------------------------------------------------------------------
 int CORPORATIONS_IMPL::CloseSearch(int h) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (searchDescriptors.find(h) != searchDescriptors.end())
     {
     searchDescriptors.erase(searchDescriptors.find(h));
 if (searchDescriptors.find(h) != searchDescriptors.end())
     {
     searchDescriptors.erase(searchDescriptors.find(h));