summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-04-08 18:38:26 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-04-08 19:10:23 (GMT)
commit32f38cc3b6cdfb22c04c438bda59374fb8211f01 (patch)
tree0a231ad2a72662cdb1cd3c109ef21bd245a38ae2
parent4a68f4e6d17752ef036083a1b98e544eb8232b67 (diff)
downloadswift-contrib-32f38cc3b6cdfb22c04c438bda59374fb8211f01.zip
swift-contrib-32f38cc3b6cdfb22c04c438bda59374fb8211f01.tar.bz2
Fix bug in copyrighter script that handled MD5 copyright incorrectly.
-rwxr-xr-xBuildTools/Copyrighter.py4
-rw-r--r--Swiften/StringCodecs/MD5.cpp11
2 files changed, 6 insertions, 9 deletions
diff --git a/BuildTools/Copyrighter.py b/BuildTools/Copyrighter.py
index 0016037..56e6be9 100755
--- a/BuildTools/Copyrighter.py
+++ b/BuildTools/Copyrighter.py
@@ -61,11 +61,11 @@ def parse_file(filename) :
if re.match(get_comment_chars_re_for_filename(filename), line) != None :
copyright_text.append(line.rstrip())
continue
- elif len(line.strip()) == 0 :
- continue
else :
inCopyright = False
inEpilog = True
+ if len(line.strip()) == 0 :
+ continue
if inEpilog :
epilog += line
diff --git a/Swiften/StringCodecs/MD5.cpp b/Swiften/StringCodecs/MD5.cpp
index 1a06f20..09c3a42 100644
--- a/Swiften/StringCodecs/MD5.cpp
+++ b/Swiften/StringCodecs/MD5.cpp
@@ -5,16 +5,13 @@
*/
/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-/*
* This implementation is shamelessly copied from L. Peter Deutsch's
* implementation, and altered to use our own defines and datastructures.
* Original license below.
- */
-/* Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved. This software is provided 'as-is', without any express or implied
+ *//*
+ Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved.
+
+ This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.