X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fstack%2FCommand.cpp;h=3fa3ac90b9c8f69fb34034f48ad85f697c644e0f;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=e3182887d48ae29aa38e49f8f0a9919a0b0a1a7f;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/source/diameter/stack/Command.cpp b/source/diameter/stack/Command.cpp index e318288..3fa3ac9 100644 --- a/source/diameter/stack/Command.cpp +++ b/source/diameter/stack/Command.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not 'N' Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// https://bitbucket.org/testillano/anna -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // // Local @@ -49,7 +21,7 @@ //------------------------------------------------------------------------------ //-------------------------------------------------------- Command::addAvpRule() //------------------------------------------------------------------------------ -void anna::diameter::stack::Command::addAvpRule(const AvpRule & avpRule) throw(anna::RuntimeException) { +void anna::diameter::stack::Command::addAvpRule(const AvpRule & avpRule) noexcept(false) { if(avpRule.isFixed()) { if(!a_allowFixedRule) { std::string s_ex = anna::functions::asString("Incorrect position for fixed avp rule '<%s>' within command '%s'", avpRule.getAvpName().c_str(), getName().c_str()); @@ -73,7 +45,7 @@ void anna::diameter::stack::Command::addAvpRule(const AvpRule & avpRule) throw(a //------------------------------------------------------------------------------ //----------------------------------------------------------- Command::isChild() //------------------------------------------------------------------------------ -bool anna::diameter::stack::Command::isChild(const AvpId & avpId) const throw() { +bool anna::diameter::stack::Command::isChild(const AvpId & avpId) const { for(const_avprule_iterator it = avprule_begin(); it != avprule_end(); it++) if(avpId == ((*it).second.getId())) return true; @@ -85,7 +57,7 @@ bool anna::diameter::stack::Command::isChild(const AvpId & avpId) const throw() //------------------------------------------------------------------------------ //---------------------------------------------------------- Command::asString() //------------------------------------------------------------------------------ -std::string anna::diameter::stack::Command::asString(void) const throw() { +std::string anna::diameter::stack::Command::asString(void) const { std::string trace; //trace = "Command '"; trace = "'"; @@ -103,7 +75,7 @@ std::string anna::diameter::stack::Command::asString(void) const throw() { std::string qual = (*it).second.getQual(); int NumberOfSpaces = strlen(DICTIONARY_AVPRULE_TAB) - qual.size(); - for(register int k = 0; k < NumberOfSpaces; k++) trace += " "; + for(int k = 0; k < NumberOfSpaces; k++) trace += " "; trace += (*it).second.asString(); trace += "\n"; @@ -117,7 +89,7 @@ std::string anna::diameter::stack::Command::asString(void) const throw() { //------------------------------------------------------------------------------ //------------------------------------------------------------- Command::asXML() //------------------------------------------------------------------------------ -anna::xml::Node* anna::diameter::stack::Command::asXML(anna::xml::Node* parent) const throw() { +anna::xml::Node* anna::diameter::stack::Command::asXML(anna::xml::Node* parent) const { // // anna::xml::Node* result = parent->createChild("command");