X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcomm%2FCompatCodec.cpp;h=7719090dba06dc64408efab82f94586b9716fe9e;hb=d723d5bf571eb48c641b092058eaa38bb6c4fcc8;hp=6d0c5a15265c5d3deeb25dd78968d0148ea824d0;hpb=884501d2411bc4fdfafae65948262c959e068d7d;p=anna.git

diff --git a/source/comm/CompatCodec.cpp b/source/comm/CompatCodec.cpp
index 6d0c5a1..7719090 100644
--- a/source/comm/CompatCodec.cpp
+++ b/source/comm/CompatCodec.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 //
 
 
 #include <stdlib.h>
@@ -199,17 +171,11 @@ throw(RuntimeException) {
   if(variable == NULL)
     throw RuntimeException(functions::asString("Id %d is not defined", id), ANNA_FILE_LOCATION);
 
-  switch(variable->isNull()) {
-  case true:
-
+  if(variable->isNull()) {
     if(isNull == false) a_nullCounter --;
-
-    break;
-  case false:
-
+  }
+  else {
     if(isNull == true) a_nullCounter ++;
-
-    break;
   }
 
   variable->setNull(isNull);
@@ -217,17 +183,11 @@ throw(RuntimeException) {
 
 void comm::CompatCodec::setNull(const comm::Variable* variable, const bool isNull)
 throw() {
-  switch(variable->isNull()) {
-  case true:
-
+  if(variable->isNull()) {
     if(isNull == false) a_nullCounter --;
-
-    break;
-  case false:
-
+  }
+  else {
     if(isNull == true) a_nullCounter ++;
-
-    break;
   }
 
   const_cast <comm::Variable*>(variable)->setNull(isNull);
@@ -281,10 +241,10 @@ throw(RuntimeException) {
 //-----------------------------------------------------------------------
 const DataBlock& comm::CompatCodec::code()
 throw(RuntimeException) {
-  register unsigned char c(0);
+  unsigned char c(0);
   iterator ii;
   iterator maxii(a_variables.end());
-  register Variable* variable;
+  Variable* variable;
   int stringLen;
   const char* string;
   char aux [sizeof(S64)];
@@ -349,6 +309,7 @@ throw(RuntimeException) {
         self += codec;
       }
       break;
+    default: break;
     }
   }
 
@@ -364,7 +325,7 @@ throw(RuntimeException) {
     char* data = const_cast <char*>(self.getData());
     int size = self.getSize();
 
-    for(register int i = 1, key = data [0]; i < size; i ++)
+    for(int i = 1, key = data [0]; i < size; i ++)
       data [i] ^= key ++;
   }
 
@@ -381,7 +342,7 @@ throw(RuntimeException) {
     throw RuntimeException("Can not decode an empty DataBlock", ANNA_FILE_LOCATION);
 
   if(data [0] != 0)
-    for(register int i = 1, key(data [0]); i < size; i ++)
+    for(int i = 1, key(data [0]); i < size; i ++)
       const_cast <char*>(data)[i] ^= key ++;
 
   LOGDEBUG(Logger::write(Logger::Debug, "comm::CompatCodec::decode", dataBlock, ANNA_FILE_LOCATION));
@@ -586,7 +547,7 @@ throw() {
 
 comm::Variable* comm::CompatCodec::VariableContainer::find(const int id)
 throw() {
-  for(register int ii = 0; ii < a_size; ii ++) {
+  for(int ii = 0; ii < a_size; ii ++) {
     if(a_variables [ii]->getId() == id)
       return a_variables [ii];
   }
@@ -596,7 +557,7 @@ throw() {
 
 const comm::Variable* comm::CompatCodec::VariableContainer::find(const int id) const
 throw() {
-  for(register int ii = 0; ii < a_size; ii ++) {
+  for(int ii = 0; ii < a_size; ii ++) {
     if(a_variables [ii]->getId() == id)
       return a_variables [ii];
   }