[sword-cvs] sword/include filemgr.h,1.19,1.20 swconfig.h,1.22,1.23

[sword@www.crosswire.org]

Update of /cvs/core/sword/include
In directory www:/tmp/cvs-serv14607/include

Modified Files:
	filemgr.h swconfig.h 
Log Message:
removed fopen and related functions from swconfig and added dependency of
FileMgr
Added a getLine function to filemgr


Index: filemgr.h
===================================================================
RCS file: /cvs/core/sword/include/filemgr.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- filemgr.h	15 Aug 2003 08:52:15 -0000	1.19
+++ filemgr.h	17 Jan 2004 04:33:25 -0000	1.20
@@ -26,9 +26,14 @@
 #include <fcntl.h>
 
 #include <defs.h>
+#include <swbuf.h>
 
 SWORD_NAMESPACE_START
 
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
 class SWDLLEXPORT FileMgr;
 
 /**
@@ -142,6 +147,7 @@
 	static int createPathAndFile(const char *fName);
 	static int copyFile(const char *sourceFile, const char *targetFile);
 	static int removeFile(const char *fName);
+	static char getLine(FileDesc *fDesc, SWBuf &line);
 
 };
 

Index: swconfig.h
===================================================================
RCS file: /cvs/core/sword/include/swconfig.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- swconfig.h	27 Jun 2003 01:41:06 -0000	1.22
+++ swconfig.h	17 Jan 2004 04:33:25 -0000	1.23
@@ -41,7 +41,7 @@
 */
 class SWDLLEXPORT SWConfig {
 private:
-	char getline(FILE * fp, SWBuf & line);
+	char getline(int fd, SWBuf &line);
 public:
 	/** The filename used by this SWConfig object
 	*