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).

8 files changed, 76 insertions, 60 deletions

diff --git a/src/mutex/noop_mutex/mux_noop.cpp b/src/mutex/noop_mutex/mux_noop.cpp
index eb3a12702..5c45084fe 100644
--- a/src/mutex/noop_mutex/mux_noop.cpp
+++ b/src/mutex/noop_mutex/mux_noop.cpp
@@ -1,15 +1,17 @@
-/*************************************************
-* No-Op Mutex Factory Source File                *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* No-Op Mutex Factory
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/mux_noop.h>
 
 namespace Botan {
 
-/*************************************************
-* No-Op Mutex Factory                            *
-*************************************************/
+/*
+* No-Op Mutex Factory
+*/
 Mutex* Noop_Mutex_Factory::make()
    {
    class Noop_Mutex : public Mutex
diff --git a/src/mutex/noop_mutex/mux_noop.h b/src/mutex/noop_mutex/mux_noop.h
index a5b802cc0..94201cb7c 100644
--- a/src/mutex/noop_mutex/mux_noop.h
+++ b/src/mutex/noop_mutex/mux_noop.h
@@ -1,7 +1,9 @@
-/*************************************************
-* No-Op Mutex Factory Header File                *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* No-Op Mutex Factory
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_NOOP_MUTEX_FACTORY_H__
 #define BOTAN_NOOP_MUTEX_FACTORY_H__
@@ -10,9 +12,9 @@
 
 namespace Botan {
 
-/*************************************************
-* No-Op Mutex Factory                            *
-*************************************************/
+/*
+* No-Op Mutex Factory
+*/
 class BOTAN_DLL Noop_Mutex_Factory : public Mutex_Factory
    {
    public:
diff --git a/src/mutex/pthreads/mux_pthr.cpp b/src/mutex/pthreads/mux_pthr.cpp
index d003fa298..9f1d9816e 100644
--- a/src/mutex/pthreads/mux_pthr.cpp
+++ b/src/mutex/pthreads/mux_pthr.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* Pthread Mutex Source File                      *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Pthread Mutex
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/mux_pthr.h>
 #include <botan/exceptn.h>
@@ -14,9 +16,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Pthread Mutex Factory                          *
-*************************************************/
+/*
+* Pthread Mutex Factory
+*/
 Mutex* Pthread_Mutex_Factory::make()
    {
 
diff --git a/src/mutex/pthreads/mux_pthr.h b/src/mutex/pthreads/mux_pthr.h
index 79eed0c97..118853947 100644
--- a/src/mutex/pthreads/mux_pthr.h
+++ b/src/mutex/pthreads/mux_pthr.h
@@ -1,7 +1,9 @@
-/*************************************************
-* Pthread Mutex Header File                      *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Pthread Mutex
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_MUTEX_PTHREAD_H__
 #define BOTAN_MUTEX_PTHREAD_H__
@@ -10,9 +12,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Pthread Mutex Factory                          *
-*************************************************/
+/*
+* Pthread Mutex Factory
+*/
 class BOTAN_DLL Pthread_Mutex_Factory : public Mutex_Factory
    {
    public:
diff --git a/src/mutex/qt_mutex/mux_qt.cpp b/src/mutex/qt_mutex/mux_qt.cpp
index 421b771c7..0f670c8b4 100644
--- a/src/mutex/qt_mutex/mux_qt.cpp
+++ b/src/mutex/qt_mutex/mux_qt.cpp
@@ -1,8 +1,10 @@
-/*************************************************
-* Qt Thread Mutex Source File                    *
-* (C) 2004-2007 Justin Karneges                  *
-*     2004-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Qt Thread Mutex
+* (C) 2004-2007 Justin Karneges
+*     2004-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/mux_qt.h>
 #include <qmutex.h>
@@ -13,9 +15,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Qt Mutex Factory                               *
-*************************************************/
+/*
+* Qt Mutex Factory
+*/
 Mutex* Qt_Mutex_Factory::make()
    {
    class Qt_Mutex : public Mutex
diff --git a/src/mutex/qt_mutex/mux_qt.h b/src/mutex/qt_mutex/mux_qt.h
index bf230e1ff..5aed77f4b 100644
--- a/src/mutex/qt_mutex/mux_qt.h
+++ b/src/mutex/qt_mutex/mux_qt.h
@@ -1,8 +1,10 @@
-/*************************************************
-* Qt Mutex Header File                           *
-* (C) 2004-2007 Justin Karneges                  *
-*     2004-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Qt Mutex
+* (C) 2004-2007 Justin Karneges
+*     2004-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_MUTEX_QT_H__
 #define BOTAN_MUTEX_QT_H__
@@ -11,9 +13,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Qt Mutex                                       *
-*************************************************/
+/*
+* Qt Mutex
+*/
 class BOTAN_DLL Qt_Mutex_Factory : public Mutex_Factory
    {
    public:
diff --git a/src/mutex/win32_crit_section/mux_win32.cpp b/src/mutex/win32_crit_section/mux_win32.cpp
index 622a707fa..2a967892b 100644
--- a/src/mutex/win32_crit_section/mux_win32.cpp
+++ b/src/mutex/win32_crit_section/mux_win32.cpp
@@ -1,17 +1,19 @@
-/*************************************************
-* Win32 Mutex Source File                        *
-* (C) 2006 Luca Piccarreta                       *
-*     2006-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Win32 Mutex
+* (C) 2006 Luca Piccarreta
+*     2006-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/mux_win32.h>
 #include <windows.h>
 
 namespace Botan {
 
-/*************************************************
-* Win32 Mutex Factory                            *
-*************************************************/
+/*
+* Win32 Mutex Factory
+*/
 Mutex* Win32_Mutex_Factory::make()
    {
    class Win32_Mutex : public Mutex
diff --git a/src/mutex/win32_crit_section/mux_win32.h b/src/mutex/win32_crit_section/mux_win32.h
index 9073b0d3c..a91850e71 100644
--- a/src/mutex/win32_crit_section/mux_win32.h
+++ b/src/mutex/win32_crit_section/mux_win32.h
@@ -1,8 +1,10 @@
-/*************************************************
-* Win32 Mutex Header File                        *
-* (C) 2006 Luca Piccarreta                       *
-*     2006-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Win32 Mutex
+* (C) 2006 Luca Piccarreta
+*     2006-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_MUTEX_WIN32_H__
 #define BOTAN_MUTEX_WIN32_H__
@@ -11,9 +13,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Win32 Mutex Factory                            *
-*************************************************/
+/*
+* Win32 Mutex Factory
+*/
 class BOTAN_DLL Win32_Mutex_Factory : public Mutex_Factory
    {
    public: