Deprecate u_short, u_int and u_long types in libpsn00b

3 files changed, 31 insertions, 30 deletions

diff --git a/libpsn00b/lzp/crc.c b/libpsn00b/lzp/crc.c
index 3c1ae57..6b00c8e 100644
--- a/libpsn00b/lzp/crc.c
+++ b/libpsn00b/lzp/crc.c
@@ -1,14 +1,15 @@
+#include <stdint.h>
 #include "lzp.h"
 
-void initTable16(unsigned short* table) {
+void initTable16(uint16_t *table) {
 
 	int i, j;
-    unsigned short crc, c;
+    uint16_t crc, c;
 
     for (i=0; i<256; i++) {
 
         crc = 0;
-        c   = (unsigned short) i;
+        c   = (uint16_t) i;
 
         for (j=0; j<8; j++) {
 
@@ -25,10 +26,10 @@ void initTable16(unsigned short* table) {
 
 }
 
-void initTable32(unsigned int* table) {
+void initTable32(uint32_t *table) {
 
 	int i,j;
-	unsigned int crcVal;
+	uint32_t crcVal;
 
 	for(i=0; i<256; i++) {
 
@@ -49,17 +50,17 @@ void initTable32(unsigned int* table) {
 
 }
 
-unsigned short lzCRC16(const void* buff, int bytes, unsigned short crc) {
+uint16_t lzCRC16(const void* buff, int bytes, uint16_t crc) {
 
 	int i;
-	unsigned short tmp, short_c;
-	unsigned short crcTable[256];
+	uint16_t tmp, short_c;
+	uint16_t crcTable[256];
 
 	initTable16(crcTable);
 
 	for(i=0; i<bytes; i++) {
 
-		short_c = 0x00ff & (unsigned short)((const unsigned char*)buff)[i];
+		short_c = 0x00ff & (uint16_t)((const uint8_t *)buff)[i];
 
 		tmp =  crc       ^ short_c;
 		crc = (crc >> 8) ^ crcTable[tmp&0xff];
@@ -70,18 +71,18 @@ unsigned short lzCRC16(const void* buff, int bytes, unsigned short crc) {
 
 }
 
-unsigned int lzCRC32(const void* buff, int bytes, unsigned int crc) {
+uint32_t lzCRC32(const void* buff, int bytes, uint32_t crc) {
 
 	int	i;
-	const unsigned char*	byteBuff = (const unsigned char*)buff;
-	unsigned int			byte;
-	unsigned int			crcTable[256];
+	const uint8_t	*byteBuff = (const uint8_t *)buff;
+	uint32_t		byte;
+	uint32_t		crcTable[256];
 
     initTable32(crcTable);
 
 	for(i=0; i<bytes; i++) {
 
-		byte = 0x000000ffL&(unsigned int)byteBuff[i];
+		byte = 0x000000ffL&(uint32_t)byteBuff[i];
 		crc = (crc>>8)^crcTable[(crc^byte)&0xff];
 
 	}
diff --git a/libpsn00b/lzp/lzp.h b/libpsn00b/lzp/lzp.h
index cfeeb72..456de02 100644
--- a/libpsn00b/lzp/lzp.h
+++ b/libpsn00b/lzp/lzp.h
@@ -16,7 +16,7 @@
 #ifndef _LZPACK_H
 #define _LZPACK_H
 
-#include <sys/types.h>
+#include <stdint.h>
 #ifdef _WIN32
 #include <windows.h>
 #endif
@@ -64,9 +64,9 @@
 typedef struct {
 
 	//! File ID (must always be 'LZP')
-	char	id[3];
+	char	    id[3];
 	//! File count
-	u_char	numFiles;
+	uint8_t 	numFiles;
 
 } LZP_HEAD;
 
@@ -74,15 +74,15 @@ typedef struct {
 typedef struct {
 
 	//! File name
-    char	fileName[16];
+    char	    fileName[16];
     //! CRC32 checksum of file
-    u_int	crc;
+    uint32_t	crc;
     //! Original size of file in bytes
-    u_int	fileSize;
+    uint32_t	fileSize;
     //! Compressed size of file
-    u_int	packedSize;
+    uint32_t	packedSize;
     //! File data offset
-    u_int	offset;
+    uint32_t	offset;
 
 } LZP_FILE;
 
@@ -162,7 +162,7 @@ void lzResetHashSizes();
  *
  *	\returns CRC16 hash of specified buffer.
  */
-unsigned short lzCRC16(const void* buff, int bytes, unsigned short crc);
+uint16_t lzCRC16(const void* buff, int bytes, uint16_t crc);
 
 /*!	Calculates a CRC32 hash of the specified buffer.
  *
@@ -172,7 +172,7 @@ unsigned short lzCRC16(const void* buff, int bytes, unsigned short crc);
  *
  *	\returns CRC32 hash of specified buffer.
  */
-unsigned int lzCRC32(const void* buff, int bytes, unsigned int crc);
+uint32_t lzCRC32(const void* buff, int bytes, uint32_t crc);
 
 /*!	@}	*/
 
diff --git a/libpsn00b/lzp/lzqlp.h b/libpsn00b/lzp/lzqlp.h
index 5b70b40..32ce0d7 100644
--- a/libpsn00b/lzp/lzqlp.h
+++ b/libpsn00b/lzp/lzqlp.h
@@ -1,7 +1,7 @@
 #ifndef _QLP_H
 #define _QLP_H
 
-#include <sys/types.h>
+#include <stdint.h>
 #ifdef _WIN32
 #include <windows.h>
 #endif
@@ -13,14 +13,14 @@
 #define PACK_ERR_READ_FAULT		-4
 
 typedef struct {
-	char	id[3];
-	u_char	numfiles;
+	char		id[3];
+	uint8_t		numfiles;
 } QLP_HEAD;
 
 typedef struct {
-	char	name[16];
-	u_int	size;
-	u_int	offs;
+	char		name[16];
+	uint32_t	size;
+	uint32_t	offs;
 } QLP_FILE;
 
 int qlpFileCount(const QLP_HEAD* qlpfile);