X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FStringParser.cti;h=86f3e0734f96ce445376b567796ef0928b943253;hb=ab7ff164ab5ae711ec09ce2b24228510f1ffdcff;hp=36b3075c977a0598b93ef7f319bc65e20061774c;hpb=a3f9296f648c4991a1576d4200abfdc72788bc16;p=senf.git

diff --git a/senf/Packets/StringParser.cti b/senf/Packets/StringParser.cti
index 36b3075..86f3e07 100644
--- a/senf/Packets/StringParser.cti
+++ b/senf/Packets/StringParser.cti
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief StringParser inline template implementation */
@@ -28,34 +33,34 @@
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 template <class LengthParser>
 prefix_ senf::StringParser<LengthParser>::StringParser(data_iterator i, state_type s)
-    : PacketParserBase(i, s, init_bytes) 
+    : PacketParserBase(i, s, init_bytes)
  {}
 
 template <class LengthParser>
 prefix_ typename senf::StringParser<LengthParser>::size_type senf::StringParser<LengthParser>::bytes()
     const
-{ 
-    return length().value() + senf::bytes(length()); 
+{
+    return length().value() + senf::bytes(length());
 }
 
 template <class LengthParser>
 prefix_ typename senf::StringParser<LengthParser>::value_type senf::StringParser<LengthParser>::value()
     const
-{ 
-    validate(bytes()); 
-    return std::string(i()+senf::bytes(length()), i()+bytes()); 
+{
+    validate(bytes());
+    return std::string(i()+senf::bytes(length()), i()+bytes());
 }
 
 template <class LengthParser>
 prefix_ void senf::StringParser<LengthParser>::value(value_type v)
-{ 
+{
     validate(bytes());
-    resize(bytes(), v.size()+senf::bytes(length())); 
-    parse<UInt16Parser>(0) = v.size(); 
+    resize(bytes(), v.size()+senf::bytes(length()));
+    length() << v.size();
     std::copy(v.begin(), v.end(), i()+senf::bytes(length()));
 }
 
@@ -63,13 +68,13 @@ template <class LengthParser>
 prefix_ senf::StringParser<LengthParser>::operator value_type()
     const
 {
-    return value(); 
+    return value();
 }
 
 template <class LengthParser>
 prefix_ typename senf::StringParser<LengthParser> const & senf::StringParser<LengthParser>::operator=(value_type other)
-{ 
-    value(other); return *this; 
+{
+    value(other); return *this;
 }
 
 template <class LengthParser>
@@ -79,7 +84,7 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, StringParser<LengthPa
     return os;
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_