X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fstack%2FDictionary.cpp;h=821659cc592822a3d080cb629052f9965c4399ce;hb=42f606f1c76bfbef24e7e772b6939d69d5ea970e;hp=bed9fe139646d9c2d71a0f9aca59dd3e253a709a;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/source/diameter/stack/Dictionary.cpp b/source/diameter/stack/Dictionary.cpp
index bed9fe1..821659c 100644
--- a/source/diameter/stack/Dictionary.cpp
+++ b/source/diameter/stack/Dictionary.cpp
@@ -1,8 +1,8 @@
-// ANNA - Anna is Not 'N' Anymore
+// ANNA - Anna is Not Nothingness Anymore
 //
 // (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
 //
-// https://bitbucket.org/testillano/anna
+// http://redmine.teslayout.com/projects/anna-suite
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
@@ -14,7 +14,7 @@
 // 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
+//     *  Neither the name of the copyright holder nor the names of its
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
@@ -157,9 +157,8 @@ void Dictionary::addFormat(const Format & format, bool reserved) throw(anna::Run
     throw anna::RuntimeException(s_ex, ANNA_FILE_LOCATION);
   }
 
-  const Format * found;
-
-  if(found = getFormat(format.getName())) {
+  const Format * found = getFormat(format.getName());
+  if(found) {
     if(!a_allowUpdates) {
       std::string s_ex = "Cannot add a format with an existing type name: ";
       //s_ex += format.getName();
@@ -186,9 +185,9 @@ void Dictionary::addFormat(const Format & format, bool reserved) throw(anna::Run
 //------------------------------------------------------ Dictionary::addVendor()
 //------------------------------------------------------------------------------
 void Dictionary::addVendor(const Vendor & vendor) throw(anna::RuntimeException) {
-  const Vendor * found;
 
-  if(found = getVendor(vendor.getId())) {
+  const Vendor * found = getVendor(vendor.getId());
+  if(found) {
     if(!a_allowUpdates) {
       std::string s_ex = "Cannot add a vendor with an existing code: ";
       s_ex += vendor.asString();
@@ -198,7 +197,8 @@ void Dictionary::addVendor(const Vendor & vendor) throw(anna::RuntimeException)
     ITEM_OVERWRITE("vendor", vendor, a_vendors, a_vendorNames);
   }
 
-  if(found = getVendor(vendor.getName())) {
+  found = getVendor(vendor.getName());
+  if(found) {
     if(!a_allowUpdates) {
       std::string s_ex = "Cannot add a vendor with an existing name: ";
       s_ex += vendor.asString();
@@ -217,9 +217,9 @@ void Dictionary::addVendor(const Vendor & vendor) throw(anna::RuntimeException)
 //--------------------------------------------------------- Dictionary::addAvp()
 //------------------------------------------------------------------------------
 void Dictionary::addAvp(const Avp & avp) throw(anna::RuntimeException) {
-  const Avp * found;
 
-  if(found = getAvp(avp.getId())) {
+  const Avp * found = getAvp(avp.getId());
+  if (found) {
     if(!a_allowUpdates) {
       std::string s_ex = "Cannot add an avp with an existing identifier (code,vendor):\n";
       s_ex += avp.asString();
@@ -248,11 +248,11 @@ void Dictionary::addAvp(const Avp & avp) throw(anna::RuntimeException) {
 //----------------------------------------------------- Dictionary::addCommand()
 //------------------------------------------------------------------------------
 void Dictionary::addCommand(const Command & command) throw(anna::RuntimeException) {
-  const Command * found;
-
-  if(found = getCommand(command.getId())) {
+  
+  const Command * found = getCommand(command.getId());
+  if(found) {
     if(!a_allowUpdates) {
-      std::string s_ex = "Cannot add a command with an existing identifier (code,request):\n";
+      std::string s_ex = "Cannot add a command with an existing identifier:\n";
       s_ex += command.asString();
       throw anna::RuntimeException(s_ex, ANNA_FILE_LOCATION);
     }
@@ -260,7 +260,9 @@ void Dictionary::addCommand(const Command & command) throw(anna::RuntimeExceptio
     ITEM_OVERWRITE("command", command, a_commands, a_commandNames);
   }
 
-  if(found = getCommand(command.getName())) {
+  
+  found = getCommand(command.getName());
+  if(found) {
     if(!a_allowUpdates) {
       std::string s_ex = "Cannot add a command with an existing name:\n";
       s_ex += command.asString();