[asterisk-scf-commits] asterisk-scf/release/sip.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Mon Jan 17 17:15:33 CST 2011


branch "master" has been updated
       via  dfd4ca15e66cde8fb9fd4bd088a67159e12dc1aa (commit)
      from  aa85fdfbfc3d130e68239e6baf166ca9a1b94f5c (commit)

Summary of changes:
 src/PJSipSessionModule.cpp |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)


- Log -----------------------------------------------------------------
commit dfd4ca15e66cde8fb9fd4bd088a67159e12dc1aa
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon Jan 17 17:22:43 2011 -0600

    Remove unneeded std::endls.

diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 3c1ece4..3080204 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -96,14 +96,14 @@ public:
         }
         catch (const std::exception &e)
         {
-            lg(Debug) << "ConnectBridgedSessionsCallback sending 400 due to exception:  " << e.what() << std::endl;
+            lg(Debug) << "ConnectBridgedSessionsCallback sending 400 due to exception:  " << e.what();
             pjsip_dlg_respond(mInvSession->dlg, mRData, 400, NULL, NULL, NULL);
             return;
         }
         pjsip_dlg_respond(mInvSession->dlg, mRData, 200, NULL, NULL, NULL);
         
         Ice::Current current;
-        lg(Debug) << "ConnectBridgedSessionsCallback calling session->stop(). " << std::endl;
+        lg(Debug) << "ConnectBridgedSessionsCallback calling session->stop(). ";
         mSession->stop(new ResponseCode(16), current);
     }
 private:
@@ -129,21 +129,21 @@ public:
         }
         catch (const AsteriskSCF::Core::Routing::V1::DestinationNotFoundException &)
         {
-            lg(Debug) << "ConnectBridgedSessionsWithDestination sending 404 due to destination not found for target: "<< mTarget <<  std::endl;
+            lg(Debug) << "ConnectBridgedSessionsWithDestination sending 404 due to destination not found for target: "<< mTarget;
 
             pjsip_dlg_respond(mInvSession->dlg, mRData, 404, NULL, NULL, NULL);
             return;
         }
         catch (const std::exception &e)
         {
-            lg(Debug) << "ConnectBridgedSessionsWithDestination sending 400 due to exception:  " << e.what() << std::endl;
+            lg(Debug) << "ConnectBridgedSessionsWithDestination sending 400 due to exception:  " << e.what();
             pjsip_dlg_respond(mInvSession->dlg, mRData, 400, NULL, NULL, NULL);
             return;
         }
         pjsip_dlg_respond(mInvSession->dlg, mRData, 200, NULL, NULL, NULL);
         
         Ice::Current current;
-        lg(Debug) << "ConnectBridgedSessionsWithDestination calling session->stop(). " << std::endl;
+        lg(Debug) << "ConnectBridgedSessionsWithDestination calling session->stop(). ";
         mSession->stop(new ResponseCode(16), current);
     }
 private:
@@ -161,7 +161,7 @@ public:
     ListenerCallback(const std::string name) : mCallbackName(name) {}
     void failure(const Ice::Exception &ex)
     {
-        lg(Error) << "Ice exception when attempting to relate " << mCallbackName << " state: " << ex.what() << std::endl;
+        lg(Error) << "Ice exception when attempting to relate " << mCallbackName << " state: " << ex.what();
     }
 private:
     const std::string mCallbackName;
@@ -362,7 +362,7 @@ void PJSipSessionModule::replicateState(PJSipDialogModInfo *dlgInfo, PJSipTransa
             }
             catch (const Ice::NoEndpointException&)
             {
-                lg(Error) << "No endpoint for oneway invocation of setState() for state replication." << std::endl;
+                lg(Error) << "No endpoint for oneway invocation of setState() for state replication.";
             }
 
             AsteriskSCF::SIP::V1::SipStateReplicatorPrx oneWayStateReplicator = AsteriskSCF::SIP::V1::SipStateReplicatorPrx::uncheckedCast(oneway);
@@ -373,7 +373,7 @@ void PJSipSessionModule::replicateState(PJSipDialogModInfo *dlgInfo, PJSipTransa
             }
             catch (const Ice::TwowayOnlyException&)
             {
-                lg(Error) << "setState() is not oneway." << std::endl;
+                lg(Error) << "setState() is not oneway.";
             }
         }
 
@@ -386,7 +386,7 @@ void PJSipSessionModule::replicateState(PJSipDialogModInfo *dlgInfo, PJSipTransa
             }
             catch (const Ice::NoEndpointException&)
             {
-                lg(Error) << "No endpoint for oneway invocation of removeState() for state replication." << std::endl;
+                lg(Error) << "No endpoint for oneway invocation of removeState() for state replication.";
             }
 
             AsteriskSCF::SIP::V1::SipStateReplicatorPrx oneWayStateReplicator = AsteriskSCF::SIP::V1::SipStateReplicatorPrx::uncheckedCast(oneway);
@@ -397,7 +397,7 @@ void PJSipSessionModule::replicateState(PJSipDialogModInfo *dlgInfo, PJSipTransa
             }
             catch (const Ice::TwowayOnlyException&)
             {
-                lg(Error) << "removeState() is not oneway." << std::endl;
+                lg(Error) << "removeState() is not oneway.";
             }
         }
     }
@@ -572,7 +572,7 @@ void PJSipSessionModule::handleRefer(pjsip_inv_session *inv, pjsip_rx_data *rdat
     const pj_str_t str_refer_to = { (char*)"Refer-To", 8 };
     pjsip_generic_string_hdr *refer_to = static_cast<pjsip_generic_string_hdr *>(pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &str_refer_to, NULL));
 
-    lg(Debug) << "Handling a REFER" << std::endl;
+    lg(Debug) << "Handling a REFER";
     if (!refer_to)
     {
         // Uh... so they didn't tell us where to REFER this to... yeah no
@@ -691,12 +691,12 @@ void PJSipSessionModule::handleRefer(pjsip_inv_session *inv, pjsip_rx_data *rdat
             ConnectBridgedSessionsCallbackPtr cb(new ConnectBridgedSessionsCallback(inv, rdata, session));
             Ice::CallbackPtr d = Ice::newCallback(cb, &ConnectBridgedSessionsCallback::callback);
 
-            lg(Debug) << "handleRefer() calling router connectBridgedSessions(). " << std::endl;
+            lg(Debug) << "handleRefer() calling router connectBridgedSessions(). ";
             mSessionRouter->begin_connectBridgedSessions(session->getSessionProxy(), other_session->getSessionProxy(), d);
         }
         catch (const Ice::CommunicatorDestroyedException &)
         {
-            lg(Debug) << "handleRefer() sending 503 due to communicator destruction" << std::endl;
+            lg(Debug) << "handleRefer() sending 503 due to communicator destruction";
             pjsip_dlg_respond(inv->dlg, rdata, 503, NULL, NULL, NULL);
             return;
         }
@@ -714,12 +714,12 @@ void PJSipSessionModule::handleRefer(pjsip_inv_session *inv, pjsip_rx_data *rdat
             ConnectBridgedSessionsWithDestinationCallbackPtr cb(new ConnectBridgedSessionsWithDestinationCallback(inv, rdata, session, target));
             Ice::CallbackPtr d = Ice::newCallback(cb, &ConnectBridgedSessionsWithDestinationCallback::callback);
 
-            lg(Debug) << "handleRefer() calling router connectBridgedSessionsWithDestination(). " << std::endl;
+            lg(Debug) << "handleRefer() calling router connectBridgedSessionsWithDestination(). ";
             mSessionRouter->begin_connectBridgedSessionsWithDestination(session->getSessionProxy(), target, d);
         }
         catch (const Ice::CommunicatorDestroyedException &)
         {
-            lg(Debug) << "handleRefer() sending 503 due to communicator destruction" << std::endl;
+            lg(Debug) << "handleRefer() sending 503 due to communicator destruction";
             pjsip_dlg_respond(inv->dlg, rdata, 503, NULL, NULL, NULL);
             return;
         }
@@ -818,7 +818,7 @@ void PJSipSessionModule::handleInviteResponse(pjsip_inv_session *inv,
             }
             catch (const Ice::Exception &ex)
             {
-                lg(Error) << "Ice exception when attempting to relate ringing state: " << ex.what() << std::endl;
+                lg(Error) << "Ice exception when attempting to relate ringing state: " << ex.what();
             }
         }
     }
@@ -841,7 +841,7 @@ void PJSipSessionModule::handleInviteResponse(pjsip_inv_session *inv,
             }
             catch (const Ice::Exception &ex)
             {
-                lg(Error) << "Ice exception when attempting to relate progressing state: " << ex.what() << std::endl;
+                lg(Error) << "Ice exception when attempting to relate progressing state: " << ex.what();
             }
         }
     }
@@ -864,7 +864,7 @@ void PJSipSessionModule::handleInviteResponse(pjsip_inv_session *inv,
                 }
                 catch (const Ice::Exception &ex)
                 {
-                    lg(Error) << "Ice exception when attempting to relate connected state: " << ex.what() << std::endl;
+                    lg(Error) << "Ice exception when attempting to relate connected state: " << ex.what();
                 }
             }
         }
@@ -914,7 +914,7 @@ void PJSipSessionModule::invOnStateChanged(pjsip_inv_session *inv, pjsip_event *
             }
             catch (const Ice::Exception &ex)
             {
-                lg(Error) << "Ice exception when attempting to relate stopped state: " << ex.what() << std::endl;
+                lg(Error) << "Ice exception when attempting to relate stopped state: " << ex.what();
             }
         }
         session_mod_info->mNeedsRemoval = true;

-----------------------------------------------------------------------


-- 
asterisk-scf/release/sip.git



More information about the asterisk-scf-commits mailing list