MPQCryptography.c doesn't really have anything to do anymore with its original piece of code; cleaning it up and renaming it.

8 files changed, 20 insertions, 46 deletions

diff --git a/MSVC8/mpqlib.vcproj b/MSVC8/mpqlib.vcproj
index 6721b2c..de4c75f 100644
--- a/MSVC8/mpqlib.vcproj
+++ b/MSVC8/mpqlib.vcproj
@@ -165,6 +165,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\mpq-crypto.c"
+				>
+			</File>
+			<File
 				RelativePath="..\mpq-errors.c"
 				>
 			</File>
@@ -181,10 +185,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\MPQCryptography.c"
-				>
-			</File>
-			<File
 				RelativePath="..\recycle.c"
 				>
 			</File>
@@ -219,6 +219,9 @@
 				>
 			</File>
 			<File
+				RelativePath="..\mpq-crypto.h"
+			</File>
+			<File
 				RelativePath="..\mpq-errors.h"
 				>
 			</File>
@@ -235,10 +238,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\MPQCryptography.h"
-				>
-			</File>
-			<File
 				RelativePath="..\mpqlib-stdint.h"
 				>
 			</File>
diff --git a/MSVC9/mpqlib.vcproj b/MSVC9/mpqlib.vcproj
index 873b84b..db04aea 100644
--- a/MSVC9/mpqlib.vcproj
+++ b/MSVC9/mpqlib.vcproj
@@ -166,6 +166,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\mpq-crypto.c"
+				>
+			</File>
+			<File
 				RelativePath=".\mpq-errors.c"
 				>
 			</File>
@@ -182,10 +186,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\MPQCryptography.c"
-				>
-			</File>
-			<File
 				RelativePath=".\recycle.c"
 				>
 			</File>
@@ -216,6 +216,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\mpq-crypto.h"
+				>
+			</File>
+			<File
 				RelativePath=".\mpq-errors.h"
 				>
 			</File>
@@ -232,10 +236,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\MPQCryptography.h"
-				>
-			</File>
-			<File
 				RelativePath=".\mpqlib-stdint.h"
 				>
 			</File>
diff --git a/Makefile b/Makefile
index 667b867..c41f319 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,12 @@ CPPFLAGS = -g -Wall -Werror -D_FILE_OFFSET_BITS=64 -I.
 LDFLAGS = -g -lz
 
 SOURCE_LIST = \
-MPQCryptography.c \
 errors.c \
 lookupa.c \
 hashtab.c \
 recycle.c \
 mpq-bios.c \
+mpq-crypto.c \
 mpq-errors.c \
 mpq-file.c \
 mpq-fs.c \
diff --git a/Makefile.mingw32 b/Makefile.mingw32
index 4c17789..67081d1 100644
--- a/Makefile.mingw32
+++ b/Makefile.mingw32
@@ -6,13 +6,12 @@ CPPFLAGS = -g -Wall -Werror -D_FILE_OFFSET_BITS=64 -I. -I ../gnuwin32/include
 LDFLAGS = -g -L../gnuwin32/lib
 
 SOURCE_LIST = \
-MPQCryptography.c \
 errors.c \
-extract.c \
 lookupa.c \
 hashtab.c \
 recycle.c \
 mpq-bios.c \
+mpq-crypto.c \
 mpq-errors.c \
 mpq-file.c \
 mpq-fs.c \
diff --git a/mpq-bios.c b/mpq-bios.c
index cf9f581..35f657c 100644
--- a/mpq-bios.c
+++ b/mpq-bios.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "MPQCryptography.h"
+#include "mpq-crypto.h"
 #include "mpq-bios.h"
 #include "mpq-errors.h"
 #include "mpq-misc.h"
diff --git a/MPQCryptography.c b/mpq-crypto.c
index e18e279..7ddbad5 100644
--- a/MPQCryptography.c
+++ b/mpq-crypto.c
@@ -1,22 +1,7 @@
-/*
- *  MPQCryptography.c
- *  MPQKit
- *
- *  Created by Jean-Francois Roy on Sat Oct 05 2002.
- *  Copyright (c) 2002-2007 MacStorm. All rights reserved.
- *
- */
-
-/*
- * Ripped for mpqlib - all endinaness stuff has been killed.
- * Also, all the unnecessary code has been ripped out.
- * Other than that, this is the exact same code.
- */
-
 #include <assert.h>
 #include <string.h>
 
-#include "MPQCryptography.h"
+#include "mpq-crypto.h"
 
 static int crypt_table_initialized = 0;
 static uint32_t crypt_table[0x500];
diff --git a/MPQCryptography.h b/mpq-crypto.h
index 53bac82..bc29509 100644
--- a/MPQCryptography.h
+++ b/mpq-crypto.h
@@ -1,12 +1,3 @@
-/*
- *  MPQCryptography.h
- *  MPQKit
- *
- *  Created by Jean-Francois Roy on Sat Oct 05 2002.
- *  Copyright (c) 2002-2007 MacStorm. All rights reserved.
- *
- */
-
 #include "mpqlib-stdint.h"
 
 #if defined(__cplusplus)
diff --git a/mpq-misc.c b/mpq-misc.c
index aa2d958..8aacfce 100644
--- a/mpq-misc.c
+++ b/mpq-misc.c
@@ -1,5 +1,5 @@
 #include "mpq-misc.h"
-#include "MPQCryptography.h"
+#include "mpq-crypto.h"
 
 /*
  * The various string hashing function.