X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FTLVParser.cci;h=13b37b7a4a2431570d49365888c956c662031275;hb=24e306cdbe3020e45f7b15d922271c8a922cf7b0;hp=359aae3401df76f193430be4d29c1c01ce8dabcf;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git

diff --git a/senf/Packets/80221Bundle/TLVParser.cci b/senf/Packets/80221Bundle/TLVParser.cci
index 359aae3..13b37b7 100644
--- a/senf/Packets/80221Bundle/TLVParser.cci
+++ b/senf/Packets/80221Bundle/TLVParser.cci
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Thorsten Horstmann <tho@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):
+//   Thorsten Horstmann <tho@berlios.de>
 
 /** \file
     \brief TLVParser inline non-template implementation */
@@ -28,17 +33,17 @@
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cci.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
-// MIHTLVLengthParser
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
+// MIHLengthParser
 
-prefix_ senf::MIHTLVLengthParser::size_type senf::MIHTLVLengthParser::bytes() const
+prefix_ senf::MIHLengthParser::size_type senf::MIHLengthParser::bytes() const
 {
     return 1 + ( length_field()<=128 ? 0 : fixed_length_field());
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // MIHFIdTLVParser::binaryNAIDecoder
 
 prefix_ senf::MIHFIdTLVParser::binaryNAIDecoder::binaryNAIDecoder()
@@ -51,7 +56,7 @@ prefix_ bool senf::MIHFIdTLVParser::binaryNAIDecoder::operator()(boost::uint8_t
     return readNextByte_;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // MIHFIdTLVParser
 
 prefix_ senf::PacketParserBase::data_iterator senf::MIHFIdTLVParser::valueBegin()
@@ -141,10 +146,10 @@ prefix_ bool senf::MIHFIdTLVParser::valueEquals( MIHFId const & id)
 }
 
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // MIHBaseTLVParser
 
-prefix_ void senf::MIHBaseTLVParser::maxLength(MIHTLVLengthParser::value_type maxl)
+prefix_ void senf::MIHBaseTLVParser::maxLength(MIHLengthParser::value_type maxl)
     const
 {
     protect(), length_().capacity(maxl);
@@ -156,7 +161,7 @@ prefix_ void senf::MIHBaseTLVParser::finalize()
 };
 
 
-///////////////////////////////cci.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_