X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcomm%2Ffunctions.cpp;h=86ecd3f00a957a97294c63eb6a6a60b1a5e835ff;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=f510c4f4a93af3ca144cc14af7888cf0de43cf43;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/source/comm/functions.cpp b/source/comm/functions.cpp
index f510c4f..86ecd3f 100644
--- a/source/comm/functions.cpp
+++ b/source/comm/functions.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 <unistd.h>
@@ -53,7 +25,7 @@ using namespace std;
 using namespace anna;
 
 comm::Application& comm::functions::getApp()
-throw(RuntimeException) {
+noexcept(false) {
   if(comm::Application::st_application == NULL)
     throw RuntimeException("No Application class has been defined", ANNA_FILE_LOCATION);
 
@@ -64,7 +36,7 @@ throw(RuntimeException) {
 }
 
 string comm::functions::getHostName()
-throw(RuntimeException) {
+noexcept(false) {
   char hostName [MAXHOSTNAMELEN];
 
   if(gethostname(hostName, MAXHOSTNAMELEN) != 0)
@@ -77,7 +49,7 @@ throw(RuntimeException) {
 
 
 std::string comm::functions::resolveIP(const char* hostname)
-throw(RuntimeException) {
+noexcept(false) {
   std::string result;
   struct hostent *host;
 
@@ -131,97 +103,3 @@ if(host->h_aliases[0] != NULL) {
   return result;
 }
 
-
-const char* comm::functions::codeInteger(char* result, const int n)
-throw() {
-  int aux(htonl(n));
-  register char* w((char*) &aux);
-  *result = *w;
-  *(result + 1) = *(w + 1);
-  *(result + 2) = *(w + 2);
-  *(result + 3) = *(w + 3);
-  return result;
-}
-
-const char* comm::functions::codeShort(char* result, const short int n)
-throw() {
-  short int aux(htons(n));
-  register char* w((char*) &aux);
-  *result = *w;
-  *(result + 1) = *(w + 1);
-  return result;
-}
-
-const char* comm::functions::codeInteger64(char* result, const Integer64 n)
-throw() {
-  Integer64 aux(0xffffffff);
-  int n2;
-  aux <<= 32;
-  aux &= n;
-  n2 = (aux >> 32) & 0xffffffff;
-  codeInteger(result, n2);
-  n2 = n & 0xffffffff;
-  codeInteger(result + sizeof(int), n2);
-  return result;
-}
-
-/*static*/
-const char* comm::functions::codeFloat(char* result, const float n)
-throw() {
-  int ii;
-  anna_memcpy(&ii, &n, sizeof(n));
-  return functions::codeInteger(result, ii);
-}
-
-/*static*/
-const char* comm::functions::codeDouble(char* result, const double n)
-throw() {
-  Integer64 ii;
-  anna_memcpy(&ii, &n, sizeof(n));
-  return functions::codeInteger64(result, ii);
-}
-
-int comm::functions::decodeInteger(const char* data)
-throw() {
-  int result;
-  register char* w((char*) &result);
-  *w  = *data;
-  *(w + 1) = *(data + 1);
-  *(w + 2) = *(data + 2);
-  *(w + 3) = *(data + 3);
-  return ntohl(result);
-}
-
-short int comm::functions::decodeShort(const char* data)
-throw() {
-  short int result;
-  register char* w((char*) &result);
-  *w  = *data;
-  *(w + 1) = *(data + 1);
-  return ntohs(result);
-}
-
-Integer64 comm::functions::decodeInteger64(const char* data)
-throw() {
-  Integer64 result(decodeInteger(data));
-  result <<= 32;
-  return result |= (decodeInteger(data + sizeof(int)) & 0xffffffff);
-}
-
-/*static*/
-float comm::functions::decodeFloat(const char* data)
-throw() {
-  float result;
-  int ii = functions::decodeInteger(data);
-  anna_memcpy(&result, &ii, sizeof(result));
-  return result;
-}
-
-/*static*/
-double comm::functions::decodeDouble(const char* data)
-throw() {
-  double result;
-  Integer64 ii = functions::decodeInteger64(data);
-  anna_memcpy(&result, &ii, sizeof(result));
-  return result;
-}