Use standard plp types.

3 files changed, 10 insertions, 10 deletions

diff --git a/sisinstall/sisinstaller.cpp b/sisinstall/sisinstaller.cpp
index a82c9a2..27fd9bd 100644
--- a/sisinstall/sisinstaller.cpp
+++ b/sisinstall/sisinstaller.cpp
@@ -77,7 +77,7 @@ SISInstaller::copyFile(SISFileRecord* fileRecord)
 }
 
 void
-SISInstaller::copyBuf(const uchar* buf, int len, char* name)
+SISInstaller::copyBuf(const uint8_t* buf, int len, char* name)
 {
 	createDirs(name);
 	char srcName[32];
@@ -151,7 +151,7 @@ SISInstaller::installFile(SISFileRecord* fileRecord)
 			if (logLevel >= 1)
 				printf("Recursive sis file...\n");
 			SISFile sisFile;
-			uchar* buf2 = m_buf + fileRecord->m_filePtrs[m_fileNo];
+			uint8_t* buf2 = m_buf + fileRecord->m_filePtrs[m_fileNo];
 			off_t len = fileRecord->m_fileLengths[m_fileNo];
 			SisRC rc = sisFile.fillFrom(buf2, len);
 			if (rc != SIS_OK)
@@ -193,13 +193,13 @@ SISInstaller::setPsion(Psion* psion)
 }
 
 SisRC
-SISInstaller::run(SISFile* file, uchar* buf, off_t len)
+SISInstaller::run(SISFile* file, uint8_t* buf, off_t len)
 {
 	return run(file, buf, len, 0);
 }
 
 SisRC
-SISInstaller::run(SISFile* file, uchar* buf, off_t len, SISFile* parent)
+SISInstaller::run(SISFile* file, uint8_t* buf, off_t len, SISFile* parent)
 {
 	int n;
 	int lang;
@@ -231,7 +231,7 @@ SISInstaller::run(SISFile* file, uchar* buf, off_t len, SISFile* parent)
 			printf("Forcing language to %d\n", lang);
 		}
 	m_file->setLanguage(lang);
-	uchar* compName = m_file->getName();
+	uint8_t* compName = m_file->getName();
 	printf("Installing component: `%s'\n", compName);
 
 	// Check Requisites.
diff --git a/sisinstall/sisinstaller.h b/sisinstall/sisinstaller.h
index 00077f3..a822baf 100644
--- a/sisinstall/sisinstaller.h
+++ b/sisinstall/sisinstaller.h
@@ -17,9 +17,9 @@ class SISInstaller
 {
 public:
 
-	SisRC run(SISFile* file, uchar* buf, off_t len);
+	SisRC run(SISFile* file, uint8_t* buf, off_t len);
 
-	SisRC run(SISFile* file, uchar* buf, off_t len, SISFile* parent);
+	SisRC run(SISFile* file, uint8_t* buf, off_t len, SISFile* parent);
 
 	/**
 	 * Ask the user which drive to install to.
@@ -39,7 +39,7 @@ private:
 
 	Psion* m_psion;
 
-	uchar* m_buf;
+	uint8_t* m_buf;
 
 	SISFile* m_file;
 
@@ -52,7 +52,7 @@ private:
 	/**
 	 * Store the contents of a buffer in a file on the Psion.
 	 */
-	void copyBuf(const uchar* buf, int len, char* name);
+	void copyBuf(const uint8_t* buf, int len, char* name);
 
 	/**
 	 * Copy a file to the Psion.
diff --git a/sisinstall/sismain.cpp b/sisinstall/sismain.cpp
index 5a5b640..17d4d2f 100644
--- a/sisinstall/sismain.cpp
+++ b/sisinstall/sismain.cpp
@@ -48,7 +48,7 @@ void main(int argc, char* argv[])
 	off_t len = st.st_size;
 	if (logLevel >= 2)
 		printf("File is %d bytes long\n", len);
-	uchar* buf = new uchar[len];
+	uint8_t* buf = new uint8_t[len];
 	int fd = open(filename, O_RDONLY);
 	if (-1 == fd)
 		error(__LINE__);