X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDumpFormat.cc;h=90bf70c71277de15a076b52084428756ff9be2e3;hb=refs%2Fheads%2Fmaster;hp=2c99df20c46a8228b4c3f6d69f7b94bf8186b5da;hpb=f076d352ab8df15662180942996ebc70a9e4d765;p=senf.git

diff --git a/senf/Packets/DumpFormat.cc b/senf/Packets/DumpFormat.cc
index 2c99df2..90bf70c 100644
--- a/senf/Packets/DumpFormat.cc
+++ b/senf/Packets/DumpFormat.cc
@@ -1,30 +1,35 @@
 // $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 DumpFormat non-inline non-template implementation */
 
 #include "Packets.hh"
-#include "DumpFormat.ih"
+//#include "DumpFormat.ih"
 
 // Custom includes
 #include <iostream>
@@ -32,7 +37,7 @@
 
 //#include "DumpFormat.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifndef SENF_PACKET_DUMP_COLON_COLUMN
 #define SENF_PACKET_DUMP_COLON_COLUMN 27
@@ -46,37 +51,7 @@ prefix_ std::string senf::fieldName(std::string const & s)
     return t;
 }
 
-prefix_ std::string senf::detail::prettySignedNumber(long long v, unsigned bits)
-{
-    if (v<0) return prettyUnsignedNumber(-v,bits,-1);
-    else     return prettyUnsignedNumber(v,bits,+1);
-}
-
-prefix_ std::string senf::detail::prettyUnsignedNumber(unsigned long long v, unsigned bits,
-                                                       int sign)
-{
-    int bytes ((bits+7)/8);
-    int digs (int(2.4*bytes)+1);
-    std::stringstream ss;
-    ss << (sign ? (sign<0 ? "-" : " ") : "") 
-       << "0x" << std::setw(2*bytes) << std::setfill('0') << std::hex 
-       << 1u*v
-       << " (" << std::setw(digs+(sign ? 1 : 0)) << std::setfill(' ') << std::dec;
-    if (sign)
-        ss << sign*static_cast<long long>(v);
-    else
-        ss << 1u*v;
-    ss << ") (";
-    for (int i (bytes-1); i>=0; --i) {
-        char c ((v>>(8*i))&0xff);
-        ss << ((c>=32 && c<=127) ? c : '.');
-    }
-    ss << ')';
-    return ss.str();
-}
-
-
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "DumpFormat.mpp"