From f323e60831f4e1e3c35ae0ed5592e49eb485eeb6 Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust.madf@gmail.com>
Date: Fri, 13 Jan 2012 20:05:15 +0200
Subject: [PATCH] Cosmetic changes

---
 projects/stargazer/plugins/other/smux/handlers.cpp |  7 +++----
 projects/stargazer/plugins/other/smux/smux.cpp     | 14 ++++----------
 projects/stargazer/plugins/other/smux/smux.h       |  6 ++++++
 projects/stargazer/plugins/other/smux/tables.cpp   |  3 +--
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/projects/stargazer/plugins/other/smux/handlers.cpp b/projects/stargazer/plugins/other/smux/handlers.cpp
index 01878da6..ac179da9 100644
--- a/projects/stargazer/plugins/other/smux/handlers.cpp
+++ b/projects/stargazer/plugins/other/smux/handlers.cpp
@@ -44,15 +44,14 @@ bool SMUX::PDUsRequestHandler(const SMUX_PDUs_t * pdus)
 printfd(__FILE__, "SMUX::PDUsRequestHandler()\n");
 asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
 #endif
-PDUsHandlers::iterator it;
-it = pdusHandlers.find(pdus->choice.pdus.present);
+PDUsHandlers::iterator it(pdusHandlers.find(pdus->choice.pdus.present));
 if (it != pdusHandlers.end())
     {
     return (this->*(it->second))(&pdus->choice.pdus);
     }
+#ifdef SMUX_DEBUG
 else
     {
-#ifdef SMUX_DEBUG
     switch (pdus->present)
         {
         case PDUs_PR_NOTHING:
@@ -67,8 +66,8 @@ else
         default:
             printfd(__FILE__, "SMUX::PDUsRequestHandler() - undefined\n");
         }
-#endif
     }
+#endif
 return true;
 }
 
diff --git a/projects/stargazer/plugins/other/smux/smux.cpp b/projects/stargazer/plugins/other/smux/smux.cpp
index 7372948a..f1c94d11 100644
--- a/projects/stargazer/plugins/other/smux/smux.cpp
+++ b/projects/stargazer/plugins/other/smux/smux.cpp
@@ -337,15 +337,14 @@ return false;
 
 bool SMUX::DispatchPDUs(const SMUX_PDUs_t * pdus)
 {
-SMUXHandlers::iterator it;
-it = smuxHandlers.find(pdus->present);
+SMUXHandlers::iterator it(smuxHandlers.find(pdus->present));
 if (it != smuxHandlers.end())
     {
     return (this->*(it->second))(pdus);
     }
+#ifdef SMUX_DEBUG
 else
     {
-#ifdef SMUX_DEBUG
     switch (pdus->present)
         {
         case SMUX_PDUs_PR_NOTHING:
@@ -361,8 +360,8 @@ else
             printfd(__FILE__, "PDUs: undefined\n");
         }
     asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
-#endif
     }
+#endif
 return false;
 }
 
@@ -468,15 +467,10 @@ tariffs->DelNotifierAdd(&addDelTariffNotifier);
 users->DelNotifierUserDel(&delUserNotifier);
 users->DelNotifierUserAdd(&addUserNotifier);
 
-std::list<CHG_AFTER_NOTIFIER>::iterator it = notifiers.begin();
+std::list<CHG_AFTER_NOTIFIER>::iterator it(notifiers.begin());
 while (it != notifiers.end())
     {
     it->GetUserPtr()->GetProperty().tariffName.DelAfterNotifier(&(*it));
     ++it;
     }
 }
-
-void CHG_AFTER_NOTIFIER::Notify(const std::string &, const std::string &)
-{
-smux.UpdateTables();
-}
diff --git a/projects/stargazer/plugins/other/smux/smux.h b/projects/stargazer/plugins/other/smux/smux.h
index a9232608..9d0e516d 100644
--- a/projects/stargazer/plugins/other/smux/smux.h
+++ b/projects/stargazer/plugins/other/smux/smux.h
@@ -182,6 +182,12 @@ private:
 };
 //-----------------------------------------------------------------------------
 
+inline
+void CHG_AFTER_NOTIFIER::Notify(const std::string &, const std::string &)
+{
+smux.UpdateTables();
+}
+
 inline
 void ADD_DEL_TARIFF_NOTIFIER::Notify(const TARIFF_DATA &)
 {
diff --git a/projects/stargazer/plugins/other/smux/tables.cpp b/projects/stargazer/plugins/other/smux/tables.cpp
index ad08c40f..25b2dd85 100644
--- a/projects/stargazer/plugins/other/smux/tables.cpp
+++ b/projects/stargazer/plugins/other/smux/tables.cpp
@@ -31,8 +31,7 @@ while (!users.SearchNext(handle, &user))
     if (user->GetDeleted())
         continue;
     std::string tariffName(user->GetProperty().tariffName.ConstData());
-    std::map<std::string, size_t>::iterator it;
-    it = data.lower_bound(tariffName);
+    std::map<std::string, size_t>::iterator it(data.lower_bound(tariffName));
     if (it == data.end() ||
         it->first != tariffName)
         {
-- 
2.43.2