X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fxml%2FDocumentFile.cpp;h=824d99b18a8c29b1fe00e61b3770f0873f3c7154;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=e48d0c27cc9964eac4599347c1397b53e46d4266;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git

diff --git a/source/xml/DocumentFile.cpp b/source/xml/DocumentFile.cpp
index e48d0c2..824d99b 100644
--- a/source/xml/DocumentFile.cpp
+++ b/source/xml/DocumentFile.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/types.h>
@@ -55,7 +27,7 @@ using namespace anna;
 using namespace anna::xml;
 
 _xmlDoc* DocumentFile::do_initialize(const char* filename)
-throw(RuntimeException) {
+noexcept(false) {
   LOGMETHOD(TraceMethod tf("anna::xml::DocumentFile", "do_initialize", ANNA_FILE_LOCATION));
   _xmlDoc* result;
   a_filename = filename;
@@ -81,14 +53,14 @@ throw(RuntimeException) {
 }
 
 _xmlDoc* DocumentFile::do_initialize(const anna::DataBlock&)
-throw(RuntimeException) {
-  throw("xml::DocumentFile::do_initialize | Not implemented", ANNA_FILE_LOCATION);
+noexcept(false) {
+  throw RuntimeException("xml::DocumentFile::do_initialize | Not implemented", ANNA_FILE_LOCATION);
   return NULL;
 }
 
 
 const anna::DataBlock& DocumentFile::getContent() const
-throw(RuntimeException) {
+noexcept(false) {
   const anna::DataBlock& result = Document::getContent();
 
   if(result.isEmpty() == false)
@@ -102,7 +74,7 @@ throw(RuntimeException) {
   const int size = lseek(stream, 0, SEEK_END);
   lseek(stream, 0, SEEK_SET);
   char* buffer = new char [size];
-  read(stream, buffer, size);
+  ssize_t r = read(stream, buffer, size);
   close(stream);
   const_cast <DocumentFile*>(this)->setContent(buffer, size);
   delete buffer;