X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fhttp%2Finternal%2FToken.cpp;h=98ff92586c3c47a278ace55fc3c2a3ff03249c06;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=66aebfd916c402f7b5b6bc65623508a6672911b2;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/source/http/internal/Token.cpp b/source/http/internal/Token.cpp index 66aebfd..98ff925 100644 --- a/source/http/internal/Token.cpp +++ b/source/http/internal/Token.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 @@ -46,7 +18,7 @@ using namespace std; using namespace anna; const string& http::Token::getStringValue() const -throw() { +{ if(contains(0) == false) const_cast (this)->a_aux.assign(DataBlock::getData(), DataBlock::getSize()); else @@ -56,7 +28,7 @@ throw() { } int http::Token::getIntegerValue() const -throw() { +{ if(contains(0) == false) { const_cast (this)->a_aux.assign(DataBlock::getData(), DataBlock::getSize()); return atoi(a_aux.c_str()); @@ -66,9 +38,9 @@ throw() { } bool http::Token::contains(const char byte) const -throw() { - register const char* p; - register const char* maxp; +{ + const char* p; + const char* maxp; for(p = DataBlock::getData(), maxp = p + DataBlock::getSize(); p < maxp; p ++) { if(*p == byte) @@ -79,7 +51,7 @@ throw() { } int http::Token::calculeOffset(const DataBlock& base) const -throw(RuntimeException) { +noexcept(false) { const int result = getData() - base.getData(); if(result < 0) { @@ -92,7 +64,7 @@ throw(RuntimeException) { } bool http::Token::match(const char* str) const -throw() { +{ const char* pp = DataBlock::getData(); int size = DataBlock::getSize();