[Scummvm-cvs-logs] CVS: scummvm/gob resource.cpp,1.4,1.5

Nicolas Bacca arisme at users.sourceforge.net
Sun Apr 10 14:10:00 CEST 2005


Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18339

Modified Files:
	resource.cpp 
Log Message:
Get rid of posixism

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/resource.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- resource.cpp	9 Apr 2005 19:32:29 -0000	1.4
+++ resource.cpp	10 Apr 2005 21:09:27 -0000	1.5
@@ -38,20 +38,15 @@
 }
 
 void res_Init(void) {
-	int16 handle;
-	int16 fileSize;
-	struct stat statBuf;
-	handle = open("ALL.ASK", O_RDONLY);
-	if (handle < 0) {
+	File f;
+	uint32 fileSize;
+	if (!f.open("ALL.ASK", File::kFileReadMode)) {
 		error("ALL.ASK is missing.");
 	}
-	if (stat("ALL.ASK", &statBuf) == -1)
-		error("res_Init: Error with stat()\n");
-	fileSize = statBuf.st_size;
-
+	fileSize = f.size();
 	resourceBuf = (char *)malloc(fileSize * 4);
-	read(handle, resourceBuf, fileSize);
-	close(handle);
+	f.read(resourceBuf, fileSize);
+	f.close();
 }
 
 void res_Search(char resid) {





More information about the Scummvm-git-logs mailing list