quakefs.h -> vfs.h

quakeio.h -> vfile.h

More diff reduction between trunk and my VFS code.  Also took the time to
put some headers in order and fix a few #include's pointed out by moving
things around a bit.

include/QF/Makefile.am

@@ -5,7 +5,6 @@ include_HEADERS = asm_i386.h bspfile.h cdaudio.h checksum.h cmd.h compat.h \
 	console.h crc.h cvar.h draw.h gcc_attr.h gib.h hash.h hl.h info.h \
 	input.h joystick.h keys.h link.h locs.h mathlib.h mdfour.h model.h \
 	modelgen.h msg.h pcx.h plugin.h pr_comp.h progs.h qargs.h qdefs.h \
-	qendian.h qfgl_ext.h qfplist.h qtypes.h quakefs.h quakeio.h render.h \
-	screen.h sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h \
-	texture.h tga.h uint32.h va.h varrays.h ver_check.h vid.h wad.h \
-	zone.h
+	qendian.h qfgl_ext.h qfplist.h qtypes.h render.h screen.h sizebuf.h \
+	skin.h sound.h spritegn.h sys.h teamplay.h texture.h tga.h uint32.h \
+	va.h varrays.h ver_check.h vfile.h vfs.h vid.h wad.h zone.h

include/QF/cvar.h

@@ -30,7 +30,7 @@
 #define __cvar_h
 
 #include "QF/qtypes.h"
-#include "QF/quakeio.h"
+#include "QF/vfile.h"
 
 typedef struct cvar_s
 {

include/QF/keys.h

@@ -30,7 +30,7 @@
 #ifndef _KEYS_H
 #define _KEYS_H
 
-#include "QF/quakeio.h"
+#include "QF/vfile.h"
 
 // these are the key numbers that should be passed to Key_Event
 

include/QF/pcx.h

@@ -29,7 +29,7 @@
 #ifndef __pcx_h
 #define __pcx_h
 
-#include "QF/quakeio.h"
+#include "QF/vfile.h"
 
 typedef struct
 {

include/QF/progs.h

@@ -30,7 +30,7 @@
 #define _PROGS_H
 
 #include "QF/link.h"
-#include "QF/quakeio.h"
+#include "QF/vfile.h"
 #include "QF/pr_comp.h"
 
 typedef union eval_s

include/QF/tga.h

@@ -31,6 +31,7 @@
 
 #include "QF/gcc_attr.h"
 #include "QF/qtypes.h"
+#include "QF/vfile.h"
 
 #ifndef __GNUC__
 # if defined (__BORLANDC__) || defined (_MSC_VER)

include/QF/vfs.h

@@ -32,7 +32,7 @@
 #define __quakefs_h
 
 #include "QF/qtypes.h"
-#include "QF/quakeio.h"
+#include "QF/vfile.h"
 #include "QF/cvar.h"
 
 //============================================================================

include/gib_modules.h

@@ -30,7 +30,7 @@
 */
 
 #include "QF/gib.h"
-#include "QF/quakeio.h"
+#include "QF/vfile.h"
 
 void GIB_Module_Load (char *name, VFile *f);
 gib_module_t *GIB_Create_Module (char *name);

libs/audio/targets/snd_mem.c

@@ -38,9 +38,9 @@
 
 #include "QF/console.h"
 #include "QF/qendian.h"
-#include "QF/quakefs.h"
 #include "QF/sound.h"
 #include "QF/sys.h"
+#include "QF/vfs.h"
 
 int         cache_full_cycle;
 

libs/gamecode/pr_edict.c

@@ -47,10 +47,10 @@
 #include "QF/progs.h"
 #include "QF/qdefs.h"
 #include "QF/qendian.h"
-#include "QF/quakefs.h"
 #include "QF/sys.h"	//XXX
 #include "QF/zone.h"
 #include "QF/va.h"
+#include "QF/vfs.h"
 
 cvar_t     *pr_boundscheck;
 cvar_t     *pr_deadbeef;

libs/gib/gib.c

@@ -37,7 +37,7 @@
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/gib.h"
-#include "QF/quakefs.h"
+#include "QF/vfs.h"
 
 #include "gib_instructions.h"
 #include "gib_interpret.h"

libs/gib/gib_modules.c

@@ -46,7 +46,7 @@
 
 #include "QF/console.h"
 #include "QF/gib.h"
-#include "QF/quakeio.h"
+#include "QF/vfile.h"
 
 #include "gib_modules.h"
 

libs/models/alias/gl_mesh.c

@@ -42,7 +42,7 @@
 #include "QF/console.h"
 #include "QF/mdfour.h"
 #include "QF/model.h"
-#include "QF/quakefs.h"
+#include "QF/vfs.h"
 
 /*
 	ALIAS MODEL DISPLAY LIST GENERATION

libs/models/alias/model_alias.c

@@ -45,8 +45,8 @@
 #include "QF/model.h"
 #include "QF/msg.h"
 #include "QF/qendian.h"
-#include "QF/quakefs.h"
 #include "QF/sys.h"
+#include "QF/vfs.h"
 
 #include "d_iface.h"
 #include "r_local.h"

libs/models/brush/gl_model_brush.c

@@ -44,7 +44,7 @@
 #include "glquake.h"
 #include "QF/model.h"
 #include "QF/qendian.h"
-#include "QF/quakefs.h"
+#include "QF/vfs.h"
 
 int         Mod_Fullbright (byte * skin, int width, int height, char *name);
 

libs/models/model.c

@@ -43,8 +43,8 @@
 #include "QF/cvar.h"
 #include "QF/model.h"
 #include "QF/qendian.h"
-#include "QF/quakefs.h"
 #include "QF/sys.h"
+#include "QF/vfs.h"
 
 void        Mod_LoadAliasModel (model_t *mod, void *buf);
 void        Mod_LoadSpriteModel (model_t *mod, void *buf);

libs/util/cmd.c

@@ -45,9 +45,9 @@
 #include "QF/hash.h"
 #include "QF/qargs.h"
 #include "QF/qendian.h"
-#include "QF/quakefs.h"
 #include "QF/sizebuf.h"
 #include "QF/sys.h"
+#include "QF/vfs.h"
 #include "QF/zone.h"
 
 #define	MAX_ALIAS_NAME	32

libs/util/cvar.c

@@ -47,6 +47,7 @@
 #include "QF/cvar.h"
 #include "QF/hash.h"
 #include "QF/qargs.h"
+#include "QF/vfs.h"
 
 #define USER_RO_CVAR "User-created READ-ONLY Cvar"
 #define USER_CVAR "User-created cvar"

libs/util/quakefs.c

@@ -70,7 +70,7 @@
 #include "QF/qargs.h"
 #include "QF/qendian.h"
 #include "QF/qtypes.h"
-#include "QF/quakefs.h"
+#include "QF/vfs.h"
 #include "QF/sys.h"
 #include "QF/va.h"
 #include "QF/zone.h"

libs/util/quakeio.c

@@ -57,8 +57,8 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#include "QF/quakefs.h"
-#include "QF/quakeio.h"
+#include "QF/vfs.h"
+#include "QF/vfile.h"
 
 #ifdef WIN32
 # ifndef __BORLANDC__

libs/video/renderer/gl/gl_draw.c

@@ -41,12 +41,12 @@
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/draw.h"
-#include "QF/quakefs.h"
 #include "QF/render.h"
 #include "QF/screen.h"
 #include "QF/sys.h"
 #include "QF/vid.h"
 #include "QF/va.h"
+#include "QF/vfs.h"
 
 #include "glquake.h"
 #include "r_cvar.h"

libs/video/renderer/gl/gl_dyn_part.c

@@ -42,10 +42,10 @@
 #include "QF/compat.h"
 #include "QF/console.h"
 #include "QF/qargs.h"
-#include "QF/quakefs.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 #include "QF/varrays.h"
+#include "QF/vfs.h"
 
 #include "glquake.h"
 #include "r_dynamic.h"

libs/video/renderer/gl/gl_rmisc.c

@@ -41,12 +41,12 @@
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
-#include "QF/quakefs.h"
 #include "QF/render.h"
 #include "QF/skin.h"
 #include "QF/sys.h"
 #include "QF/vid.h"
 #include "QF/varrays.h"
+#include "QF/vfs.h"
 
 #include "glquake.h"
 #include "r_dynamic.h"

libs/video/renderer/gl/gl_screen.c

@@ -44,12 +44,12 @@
 #include "QF/draw.h"
 #include "QF/keys.h"
 #include "QF/pcx.h"
-#include "QF/quakefs.h" // MAX_OSPATH
 #include "QF/render.h"  // r_refdef
 #include "QF/screen.h"
 #include "QF/sys.h"
 #include "QF/texture.h"
 #include "QF/tga.h"
+#include "QF/vfs.h"     // MAX_OSPATH
 
 #include "glquake.h"
 #include "r_cvar.h"

libs/video/renderer/gl/gl_sky.c

@@ -38,9 +38,9 @@
 
 #include "QF/compat.h"
 #include "QF/console.h"
-#include "QF/quakefs.h"
 #include "QF/render.h"
 #include "QF/tga.h"
+#include "QF/vfs.h"
 #include "QF/vid.h"
 
 #include "glquake.h"

libs/video/renderer/sw/draw.c

@@ -38,9 +38,9 @@
 
 #include "QF/console.h"
 #include "QF/draw.h"
-#include "QF/quakefs.h"
 #include "QF/sound.h"
 #include "QF/sys.h"
+#include "QF/vfs.h"
 
 #include "d_iface.h"
 #include "r_cvar.h"

libs/video/renderer/sw/screen.c

@@ -44,11 +44,11 @@
 #include "QF/draw.h"
 #include "QF/keys.h"
 #include "QF/pcx.h"
-#include "QF/quakefs.h"
 #include "QF/render.h"
 #include "QF/screen.h"
 #include "QF/sys.h"
 #include "QF/texture.h"
+#include "QF/vfs.h"
 #include "QF/vid.h"
 
 #include "d_iface.h"

libs/video/renderer/sw/sw_rpart.c

@@ -35,7 +35,7 @@
 #include "QF/compat.h"
 #include "QF/console.h"
 #include "QF/qargs.h"
-#include "QF/quakefs.h"
+#include "QF/vfs.h"
 #include "QF/render.h"
 
 #include "r_cvar.h"

libs/video/targets/vid_common_gl.c

@@ -48,8 +48,8 @@
 #include "QF/console.h"
 #include "QF/input.h"
 #include "QF/qargs.h"
-#include "QF/quakefs.h"
 #include "QF/qfgl_ext.h"
+#include "QF/vfs.h"
 #include "QF/vid.h"
 #include "glquake.h"
 #include "sbar.h"

libs/video/targets/vid_glx.c

@@ -52,7 +52,6 @@
 #include "QF/input.h"
 #include "QF/qargs.h"
 #include "QF/qendian.h"
-#include "QF/quakefs.h"
 #include "QF/va.h"
 #include "QF/vid.h"
 

libs/video/targets/vid_wgl.c

@@ -40,7 +40,7 @@
 #include "QF/keys.h"
 #include "QF/qargs.h"
 #include "QF/qendian.h"
-#include "QF/quakefs.h"
+#include "QF/vfs.h"
 #include "sbar.h"
 #include "QF/screen.h"
 #include "QF/sound.h"

nq/include/client.h

@@ -35,8 +35,8 @@
 #include "QF/info.h"
 #include "QF/mathlib.h"
 #include "QF/model.h"
-#include "QF/quakefs.h"
 #include "QF/sound.h"
+#include "QF/vfs.h"
 
 #include "net.h"
 #include "protocol.h"

nq/include/server.h

@@ -39,7 +39,7 @@
 #include "sv_progs.h"
 #include "QF/sizebuf.h"
 #include "QF/info.h"
-#include "QF/quakeio.h"
+#include "QF/vfile.h"
 #include "client.h"
 
 extern progs_t sv_pr_state;

nq/source/com.c

@@ -30,12 +30,12 @@
 # include "config.h"
 #endif
 
-#include "QF/cvar.h"
-#include "QF/quakefs.h"
-#include "QF/console.h"
-#include "QF/qargs.h"
-#include "game.h"
 #include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/qargs.h"
+#include "QF/vfs.h"
+#include "game.h"
 
 void Cvar_Info (struct cvar_s *var);
 

nq/source/game.c

@@ -32,7 +32,7 @@
 # include <config.h>
 #endif
 #include "QF/qargs.h"
-#include "QF/quakefs.h"
+#include "QF/vfs.h"
 #include "game.h"
 
 qboolean standard_quake = false;

nq/source/locs.c

@@ -41,9 +41,9 @@
 #include "QF/compat.h"
 #include "QF/console.h"
 #include "QF/locs.h"
-#include "QF/quakefs.h"
 #include "QF/qtypes.h"
 #include "QF/sys.h"
+#include "QF/vfs.h"
 
 #include "client.h"
 

nq/source/net_main.c

@@ -37,14 +37,14 @@
 #endif
 
 #include "QF/cmd.h"
+#include "QF/console.h"
 #include "QF/msg.h"
-#include "net.h"
-#include "net_vcr.h"
 #include "QF/qargs.h"
 #include "QF/sizebuf.h"
-#include "QF/console.h"
 #include "QF/sys.h"
-#include "QF/quakeio.h"
+#include "QF/vfile.h"
+#include "net.h"
+#include "net_vcr.h"
 #include "server.h"
 
 qsocket_t  *net_activeSockets = NULL;

nq/source/pcx.c

@@ -40,8 +40,8 @@
 #include "QF/pcx.h"
 #include "QF/qendian.h"
 #include "QF/qtypes.h"
-#include "QF/quakefs.h"
 #include "QF/texture.h"
+#include "QF/vfs.h"
 #include "QF/vid.h"
 #include "QF/zone.h"
 

nq/source/skin.c

@@ -40,10 +40,10 @@
 #include "QF/console.h"
 #include "QF/hash.h"
 #include "QF/pcx.h"
-#include "QF/quakefs.h"
 #include "QF/skin.h"
 #include "QF/sys.h"
 #include "QF/texture.h"
+#include "QF/vfs.h"
 
 #include "client.h"
 

nq/source/sys_win.c

@@ -36,13 +36,13 @@
 
 #include "QF/compat.h"
 #include "QF/qargs.h"
-#include "QF/quakeio.h"
+#include "QF/screen.h"
 #include "QF/sys.h"
+#include "QF/vfile.h"
 
 #include "client.h"
 #include "game.h"
 #include "host.h"
-#include "QF/screen.h"
 
 #define MINIMUM_WIN_MEMORY		0x0880000
 #define MAXIMUM_WIN_MEMORY		0x1000000

nq/source/tga.c

@@ -39,9 +39,9 @@
 #include <stdlib.h>
 
 #include "QF/qendian.h"
-#include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/tga.h"
+#include "QF/vfs.h"
 
 
 static int

nq/source/wad.c

@@ -31,9 +31,9 @@
 #endif
 
 #include "QF/qendian.h"
-#include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/wad.h"
+#include "QF/vfs.h"
 
 int         wad_numlumps;
 lumpinfo_t *wad_lumps;

qw/include/cl_slist.h

@@ -31,7 +31,7 @@
 #ifndef _CL_SLIST_H
 #define _CL_SLIST_H
 
-#include "QF/quakeio.h"
+#include "QF/vfile.h"
 
 typedef struct server_entry_s {
   	char *server;

qw/include/client.h

@@ -30,7 +30,7 @@
 #define _CLIENT_H
 
 #include "QF/info.h"
-#include "QF/quakefs.h"
+#include "QF/vfs.h"
 #include "QF/vid.h"
 #include "QF/zone.h"
 

qw/include/server.h

@@ -39,7 +39,7 @@
 #include "QF/progs.h"
 #include "QF/sizebuf.h"
 #include "QF/info.h"
-#include "QF/quakeio.h"
+#include "QF/vfile.h"
 
 #define	QW_SERVER
 

qw/source/cl_main.c

@@ -47,6 +47,9 @@
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #ifdef HAVE_WINSOCK_H
 # include <winsock.h>
@@ -70,7 +73,6 @@
 #include "QF/msg.h"
 #include "QF/plugin.h"
 #include "QF/qendian.h"
-#include "QF/quakefs.h"
 #include "QF/qargs.h"
 #include "QF/screen.h"
 #include "QF/sound.h"
@@ -78,6 +80,7 @@
 #include "QF/teamplay.h"
 #include "QF/vid.h"
 #include "QF/va.h"
+#include "QF/vfs.h"
 
 #include "bothdefs.h"
 #include "buildnum.h"

qw/source/cl_parse.c

@@ -51,6 +51,7 @@
 #include "QF/sound.h"
 #include "QF/teamplay.h"
 #include "QF/va.h"
+#include "QF/vfile.h"
 
 #include "bothdefs.h"
 #include "cl_ents.h"

qw/source/cl_slist.c

@@ -58,9 +58,9 @@
 #include "client.h"
 #include "QF/cmd.h"
 #include "QF/console.h"
-#include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/va.h"
+#include "QF/vfile.h"
 
 server_entry_t *slist;
 server_entry_t *all_slist;

qw/source/com.c

@@ -35,8 +35,8 @@
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
-#include "QF/quakefs.h"
 #include "QF/sys.h"
+#include "QF/vfs.h"
 
 cvar_t     *registered;
 

qw/source/game.c

@@ -43,7 +43,7 @@
 #include "QF/cvar.h"
 #include "QF/info.h"
 #include "QF/qargs.h"
-#include "QF/quakefs.h"
+#include "QF/vfs.h"
 #include "game.h"
 #include "server.h"
 

qw/source/gl_dyn_part.c

@@ -42,10 +42,11 @@
 #include "QF/compat.h"
 #include "QF/console.h"
 #include "QF/qargs.h"
-#include "QF/quakefs.h"
+#include "QF/vfs.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 #include "QF/varrays.h"
+#include "QF/vfile.h"
 
 #include "glquake.h"
 #include "r_dynamic.h"

qw/source/keys.c

@@ -50,6 +50,7 @@
 #include "QF/keys.h"
 #include "QF/screen.h"
 #include "QF/sys.h"
+#include "QF/vfs.h"
 
 /*
   key up events are sent even if in console mode

qw/source/locs.c

@@ -41,9 +41,9 @@
 #include "QF/compat.h"
 #include "QF/console.h"
 #include "QF/locs.h"
-#include "QF/quakefs.h"
 #include "QF/qtypes.h"
 #include "QF/sys.h"
+#include "QF/vfs.h"
 
 #include "client.h"
 

qw/source/net_packetlog.c

@@ -44,7 +44,7 @@
 #include "QF/msg.h"
 #include "net.h"
 #include "protocol.h"
-#include "QF/quakefs.h"
+#include "QF/vfs.h"
 #include "server.h"
 #include "QF/va.h"
 

qw/source/pcx.c

@@ -40,8 +40,8 @@
 #include "QF/pcx.h"
 #include "QF/qendian.h"
 #include "QF/qtypes.h"
-#include "QF/quakefs.h"
 #include "QF/texture.h"
+#include "QF/vfs.h"
 #include "QF/vid.h"
 #include "QF/zone.h"
 

qw/source/skin.c

@@ -40,10 +40,10 @@
 #include "QF/console.h"
 #include "QF/hash.h"
 #include "QF/pcx.h"
-#include "QF/quakefs.h"
 #include "QF/skin.h"
 #include "QF/sys.h"
 #include "QF/texture.h"
+#include "QF/vfs.h"
 
 #include "client.h"
 

qw/source/sv_ccmds.c

@@ -44,7 +44,7 @@
 #include "QF/msg.h"
 #include "QF/qargs.h"
 #include "QF/qendian.h"
-#include "QF/quakefs.h"
+#include "QF/vfs.h"
 #include "server.h"
 #include "sv_progs.h"
 #include "QF/sys.h"

qw/source/sv_init.c

@@ -39,11 +39,11 @@
 #include "QF/crc.h"
 #include "QF/compat.h"
 #include "QF/msg.h"
-#include "QF/quakefs.h"
+#include "QF/va.h"
+#include "QF/vfs.h"
 #include "server.h"
 #include "sv_progs.h"
 #include "world.h"
-#include "QF/va.h"
 
 server_t    sv;							// local server
 

qw/source/sv_main.c

@@ -39,24 +39,24 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
-#include "bothdefs.h"
-#include "buildnum.h"
 #include "QF/cmd.h"
 #include "QF/compat.h"
-#include "game.h"
 #include "QF/model.h"
-#include "net.h"
 #include "QF/msg.h"
-#include "pmove.h"
 #include "QF/plugin.h"
 #include "QF/qargs.h"
-#include "QF/quakefs.h"
-#include "server.h"
-#include "sv_progs.h"
 #include "QF/sys.h"
 #include "QF/va.h"
 #include "QF/ver_check.h"
+#include "QF/vfs.h"
 #include "QF/zone.h"
+#include "bothdefs.h"
+#include "buildnum.h"
+#include "game.h"
+#include "net.h"
+#include "pmove.h"
+#include "server.h"
+#include "sv_progs.h"
 
 quakeparms_t host_parms;
 qboolean    host_initialized;			// true if into command execution

qw/source/sv_user.c

@@ -41,19 +41,19 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "bothdefs.h"
 #include "QF/checksum.h"
 #include "QF/cmd.h"
 #include "QF/compat.h"
 #include "QF/cvar.h"
 #include "QF/msg.h"
-#include "msg_ucmd.h"
-#include "pmove.h"
-#include "QF/quakefs.h"
-#include "server.h"
-#include "sv_progs.h"
 #include "QF/sys.h"
 #include "QF/va.h"
+#include "QF/vfs.h"
+#include "bothdefs.h"
+#include "msg_ucmd.h"
+#include "pmove.h"
+#include "server.h"
+#include "sv_progs.h"
 #include "world.h"
 
 edict_t    *sv_player;

qw/source/sw_rpart.c

@@ -35,7 +35,7 @@
 #include "QF/compat.h"
 #include "QF/console.h"
 #include "QF/qargs.h"
-#include "QF/quakefs.h"
+#include "QF/vfs.h"
 #include "QF/render.h"
 
 #include "r_cvar.h"

qw/source/tga.c

@@ -39,9 +39,9 @@
 #include <stdlib.h>
 
 #include "QF/qendian.h"
-#include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/tga.h"
+#include "QF/vfs.h"
 
 
 static int

qw/source/wad.c

@@ -37,9 +37,9 @@
 #endif
 
 #include "QF/qendian.h"
-#include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/wad.h"
+#include "QF/vfs.h"
 
 int         wad_numlumps;
 lumpinfo_t *wad_lumps;