Remove warnings (work package 1)

[anna.git] / source / comm / ClientSocket.cpp

diff --git a/source/comm/ClientSocket.cpp b/source/comm/ClientSocket.cpp
index 8614f06..3bff830 100644 (file)
--- a/source/comm/ClientSocket.cpp
+++ b/source/comm/ClientSocket.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// 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
-// 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 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.
-//
-// 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 <sys/ioctl.h>
@@ -325,7 +297,6 @@ throw() {
 comm::Socket::Notify::_v comm::ClientSocket::receive()
 throw(RuntimeException) {
    Notify::_v result;
-   int queueLength = 0;
 
    if (a_reader.getMaxSize() == 0) {
       string msg(asString());
@@ -726,9 +697,6 @@ string comm::ClientSocket::asString() const
 throw() {
    string msg("comm::ClientSocket { ");
 
-   if (this == NULL)
-      return msg += " <freed> }";
-
    msg += Socket::asString();
    msg += functions::asText(" | RcvBufferSize: ", a_rcvBufferSize);
    msg += " bytes | Status: ";
@@ -748,11 +716,6 @@ xml::Node* comm::ClientSocket::asXML(xml::Node* parent) const
 throw(RuntimeException) {
    xml::Node* clientSocket = parent->createChild("comm.ClientSocket");
 
-   if (this == NULL) {
-      clientSocket->createAttribute("Freed", "yes");
-      return clientSocket;
-   }
-
    Socket::asXML(clientSocket);
    clientSocket->createAttribute("Status", Status::asString(a_status));
    clientSocket->createAttribute("RcvBufferSize", a_rcvBufferSize);