eliminated qbyte type, now uses unsigned char throughout the engine for this purpose

[xonotic/darkplaces.git] / fs.h

diff --git a/fs.h b/fs.h
index 97ef0301a248a14d6e4ba9a20a38ea8d18a664a2..c86870f9e0c4fa5e6313aaace46d8fa4971c5660 100644 (file)
--- a/fs.h
+++ b/fs.h
@@ -1,7 +1,7 @@
 /*
        DarkPlaces file system
 
 /*
        DarkPlaces file system
 

-       Copyright (C) 2003 Mathieu Olivier
+       Copyright (C) 2003-2005 Mathieu Olivier

 
        This program is free software; you can redistribute it and/or
        modify it under the terms of the GNU General Public License
 
        This program is free software; you can redistribute it and/or
        modify it under the terms of the GNU General Public License


@@ -30,13 +30,21 @@
 
 typedef struct qfile_s qfile_t;
 
 
 typedef struct qfile_s qfile_t;
 

+#ifdef WIN32
+typedef long fs_offset_t; // 32bit
+//typedef _int64 fs_offset_t; // 64bit (lots of warnings, and lseek/read/write still don't take 64bit on win64)
+#else
+typedef long long fs_offset_t;
+#endif
+
+

 
 // ------ Variables ------ //
 
 extern char fs_gamedir [MAX_OSPATH];
 extern char fs_basedir [MAX_OSPATH];
 
 
 // ------ Variables ------ //
 
 extern char fs_gamedir [MAX_OSPATH];
 extern char fs_basedir [MAX_OSPATH];
 

-extern int fs_filesize;  // set by FS_Open (in "read" mode) and FS_LoadFile
+extern fs_offset_t fs_filesize;  // set by FS_Open (in "read" mode) and FS_LoadFile

 
 
 // ------ Main functions ------ //
 
 
 // ------ Main functions ------ //


@@ -44,18 +52,18 @@ extern int fs_filesize;  // set by FS_Open (in "read" mode) and FS_LoadFile
 // IMPORTANT: the file path is automatically prefixed by the current game directory for
 // each file created by FS_WriteFile, or opened in "write" or "append" mode by FS_Open
 
 // IMPORTANT: the file path is automatically prefixed by the current game directory for
 // each file created by FS_WriteFile, or opened in "write" or "append" mode by FS_Open
 

-qfile_t *FS_Open (const char* filepath, const char* mode, qboolean quiet);
+qfile_t *FS_Open (const char* filepath, const char* mode, qboolean quiet, qboolean nonblocking);

 int FS_Close (qfile_t* file);
 int FS_Close (qfile_t* file);

-size_t FS_Write (qfile_t* file, const void* data, size_t datasize);
-size_t FS_Read (qfile_t* file, void* buffer, size_t buffersize);
-int FS_Flush (qfile_t* file);
-int FS_Printf (qfile_t* file, const char* format, ...);
+fs_offset_t FS_Write (qfile_t* file, const void* data, size_t datasize);
+fs_offset_t FS_Read (qfile_t* file, void* buffer, size_t buffersize);
+int FS_Print(qfile_t* file, const char *msg);
+int FS_Printf(qfile_t* file, const char* format, ...);
+int FS_VPrintf(qfile_t* file, const char* format, va_list ap);

 int FS_Getc (qfile_t* file);
 int FS_Getc (qfile_t* file);

-int FS_Seek (qfile_t* file, long offset, int whence);
-long FS_Tell (qfile_t* file);
-char *FS_Gets (qfile_t* file, char* buffer, int buffersize);
-char *FS_Getline (qfile_t *file);  // DO NOT FREE the returned buffer
-int FS_Eof (qfile_t* file);
+int FS_UnGetc (qfile_t* file, unsigned char c);
+int FS_Seek (qfile_t* file, fs_offset_t offset, int whence);
+fs_offset_t FS_Tell (qfile_t* file);
+void FS_Purge (qfile_t* file);

 
 typedef struct fssearch_s
 {
 
 typedef struct fssearch_s
 {


@@ -69,8 +77,8 @@ fssearch_t;
 fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet);
 void FS_FreeSearch(fssearch_t *search);
 
 fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet);
 void FS_FreeSearch(fssearch_t *search);
 

-qbyte *FS_LoadFile (const char *path, qboolean quiet);
-qboolean FS_WriteFile (const char *filename, void *data, int len);
+unsigned char *FS_LoadFile (const char *path, mempool_t *pool, qboolean quiet);
+qboolean FS_WriteFile (const char *filename, void *data, fs_offset_t len);

 
 
 // ------ Other functions ------ //
 
 
 // ------ Other functions ------ //