Thomas Moschny passed along a request from the Fedora packagers which came

up during the Fedora submission review, that each source file include some
text about the license. One handy Perl script later and each file now has
the line
   Distributed under the terms of the Botan license
after the copyright notices.

While I was in there modifying every file anyway, I also stripped out the
remainder of the block comments (lots of astericks before and after the
text); this is stylistic thing I picked up when I was first learning C++
but in retrospect it is not a good style as the structure makes it harder
to modify comments (with the result that comments become fewer, shorter and
are less likely to be updated, which are not good things).

2 files changed, 39 insertions, 35 deletions

diff --git a/src/alloc/system_alloc/defalloc.cpp b/src/alloc/system_alloc/defalloc.cpp
index 5fb8e1447..8791c74e4 100644
--- a/src/alloc/system_alloc/defalloc.cpp
+++ b/src/alloc/system_alloc/defalloc.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* Basic Allocators Source File                   *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Basic Allocators
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/defalloc.h>
 #include <botan/libstate.h>
@@ -13,9 +15,9 @@ namespace Botan {
 
 namespace {
 
-/*************************************************
-* Perform Memory Allocation                      *
-*************************************************/
+/*
+* Perform Memory Allocation
+*/
 void* do_malloc(u32bit n, bool do_lock)
    {
    void* ptr = std::malloc(n);
@@ -30,9 +32,9 @@ void* do_malloc(u32bit n, bool do_lock)
    return ptr;
    }
 
-/*************************************************
-* Perform Memory Deallocation                    *
-*************************************************/
+/*
+* Perform Memory Deallocation
+*/
 void do_free(void* ptr, u32bit n, bool do_lock)
    {
    if(!ptr)
@@ -47,41 +49,41 @@ void do_free(void* ptr, u32bit n, bool do_lock)
 
 }
 
-/*************************************************
-* Malloc_Allocator's Allocation                  *
-*************************************************/
+/*
+* Malloc_Allocator's Allocation
+*/
 void* Malloc_Allocator::allocate(u32bit n)
    {
    return do_malloc(n, false);
    }
 
-/*************************************************
-* Malloc_Allocator's Deallocation                *
-*************************************************/
+/*
+* Malloc_Allocator's Deallocation
+*/
 void Malloc_Allocator::deallocate(void* ptr, u32bit n)
    {
    do_free(ptr, n, false);
    }
 
-/*************************************************
-* Locking_Allocator's Allocation                 *
-*************************************************/
+/*
+* Locking_Allocator's Allocation
+*/
 void* Locking_Allocator::alloc_block(u32bit n)
    {
    return do_malloc(n, true);
    }
 
-/*************************************************
-* Locking_Allocator's Deallocation               *
-*************************************************/
+/*
+* Locking_Allocator's Deallocation
+*/
 void Locking_Allocator::dealloc_block(void* ptr, u32bit n)
    {
    do_free(ptr, n, true);
    }
 
-/*************************************************
-* Get an allocator                               *
-*************************************************/
+/*
+* Get an allocator
+*/
 Allocator* Allocator::get(bool locking)
    {
    std::string type = "";
diff --git a/src/alloc/system_alloc/defalloc.h b/src/alloc/system_alloc/defalloc.h
index dc01ee47f..627e8df70 100644
--- a/src/alloc/system_alloc/defalloc.h
+++ b/src/alloc/system_alloc/defalloc.h
@@ -1,7 +1,9 @@
-/*************************************************
-* Basic Allocators Header File                   *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Basic Allocators
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_BASIC_ALLOC_H__
 #define BOTAN_BASIC_ALLOC_H__
@@ -10,9 +12,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Malloc Allocator                              *
-*************************************************/
+/*
+* Malloc Allocator
+*/
 class BOTAN_DLL Malloc_Allocator : public Allocator
    {
    public:
@@ -22,9 +24,9 @@ class BOTAN_DLL Malloc_Allocator : public Allocator
       std::string type() const { return "malloc"; }
    };
 
-/*************************************************
-* Locking Allocator                              *
-*************************************************/
+/*
+* Locking Allocator
+*/
 class BOTAN_DLL Locking_Allocator : public Pooling_Allocator
    {
    public: