More whitespace than you can shake a shambler at.

include/compat.h

@@ -38,6 +38,7 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+
 #include <stdlib.h>
 
 #ifndef max

include/qfgl_ext.h

@@ -32,7 +32,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_WINDOWS_H
 # include <windows.h>
 #endif
@@ -42,7 +41,6 @@
 #ifdef HAVE_GL_GLX_H
 # include <GL/glx.h>
 #endif
-
 #ifdef HAVE_GL_GLEXT_H
 # include <GL/glext.h>
 #endif

include/quakeio.h

@@ -35,6 +35,7 @@
 #endif
 
 #include <stdio.h>
+
 #ifdef HAVE_ZLIB
 # include <zlib.h>
 #endif

include/win32/bc/borland.c

@@ -74,5 +74,3 @@ void snprintf(char * buffer, size_t n, const char * format, ...)
 #endif
 
 #endif
-
-

include/winquake.h

@@ -38,6 +38,7 @@
 #include <windows.h>
 #include <ddraw.h>
 #include <dsound.h>
+
 #ifdef HAVE_MGRAPH_H
 # include <mgraph.h>
 #endif

source/cd_sdl.c

@@ -28,7 +28,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_WINDOWS_H
 # include <windows.h>
 #endif

source/cd_win.c

@@ -29,6 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
 #include <windows.h>
 
 #include "cdaudio.h"

source/checksum.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif

source/cl_cam.c

@@ -34,8 +34,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <math.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -43,6 +41,8 @@
 # include <strings.h>
 #endif
 
+#include <math.h>
+
 #include "cl_cam.h"
 #include "client.h"
 #include "commdef.h"

source/cl_cmd.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif

source/cl_slist.c

@@ -32,7 +32,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif

source/cl_sys_win.c

@@ -29,6 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
 #include <stdio.h>
 #include <errno.h>
 #include <fcntl.h>

source/cl_tent.c

@@ -29,9 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <math.h>
-#include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -39,6 +36,9 @@
 # include <strings.h>
 #endif
 
+#include <math.h>
+#include <stdlib.h>
+
 #include "cl_ents.h"
 #include "cl_main.h"
 #include "cl_tent.h"

source/cmd.c

@@ -29,8 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <ctype.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -38,6 +36,8 @@
 # include <strings.h>
 #endif
 
+#include <ctype.h>
+
 #include "cvar.h"
 #include "cmd.h"
 #include "console.h"

source/console.c

@@ -29,17 +29,15 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdarg.h>
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
-
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
 
+#include <stdarg.h>
+
 #include "client.h"
 #include "cmd.h"
 #include "commdef.h"

source/context_x11.c

@@ -29,14 +29,18 @@
 	$Id$
 */
 
+#ifdef HAVE_CONFIG_H
 # include "config.h"
+#endif
 
 #include <ctype.h>
 #include <sys/time.h>
 #include <sys/types.h>
+
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+
 #include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>

source/cvar.c

@@ -32,9 +32,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdio.h>
-#include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -42,6 +39,9 @@
 # include <strings.h>
 #endif
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "commdef.h"
 #include "cvar.h"
 #include "console.h"

source/d_surf.c

@@ -30,13 +30,13 @@
 # include "config.h"
 #endif
 
+#include <stdlib.h>
+
 #include "d_local.h"
 #include "qargs.h"
 #include "r_local.h"
 #include "sys.h"
 
-#include <stdlib.h>
-
 float       surfscale;
 qboolean    r_cache_thrash;				// set if surface cache is thrashing
 

source/draw.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif

source/fnmatch.c

@@ -26,7 +26,9 @@
 	$Id$
 */
 
+#ifdef HAVE_CONFIG_H
 # include "config.h"
+#endif
 
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE

source/fractalnoise.c

@@ -1,7 +1,7 @@
 /*
 	fractalnoise.c
 
-	LordHavocs fractial noise generator.
+	LordHavocs fractal noise generator.
 
 	Copyright (C) 2000  Forest `LordHavoc` Hale.
 

source/gl_mesh.c

@@ -29,13 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
+
 #include <stdio.h>
 
 #include "console.h"

source/gl_rsurf.c

@@ -30,15 +30,15 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdio.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
+
 #include <math.h>
+#include <stdio.h>
 
 #include "glquake.h"
 #include "sys.h"

source/in_fbdev.c

@@ -30,19 +30,16 @@
 # include "config.h"
 #endif
 
+#include <termios.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+
 #include "protocol.h"
 #include "cvar.h"
 #include "keys.h"
 
-#include <termios.h>
-#include <unistd.h>
-
 cvar_t		*_windowed_mouse;
 
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-
 int
 fd_blocking (int fd, int on)
 {

source/in_svgalib.c

@@ -32,13 +32,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdio.h>
-#include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
+#include <stdio.h>
+#include <stdlib.h>
 #include <vga.h>
 #include <vgakeyboard.h>
 #include <vgamouse.h>

source/in_win.c

@@ -42,7 +42,6 @@
 #include "input.h"
 #include "cl_input.h"
 #include "view.h"
-//#include "dosisms.h"
 #include "host.h"
 
 #define DINPUT_BUFFERSIZE           16

source/in_x11.c

@@ -32,24 +32,21 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#define _BSD
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
+#define _BSD
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 

source/info.c

@@ -29,9 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdio.h>
-#include <ctype.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -39,6 +36,9 @@
 # include <strings.h>
 #endif
 
+#include <stdio.h>
+#include <ctype.h>
+
 #include "console.h"
 #include "info.h"
 

source/joy_win.c

@@ -32,7 +32,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef __MINGW32__
 # define INITGUID
 #endif

source/keys.c

@@ -29,12 +29,9 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef _WIN32
 # include <windows.h>
 #endif
-#include <stdlib.h>
-#include <ctype.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -42,6 +39,9 @@
 # include <strings.h>
 #endif
 
+#include <stdlib.h>
+#include <ctype.h>
+
 #include "client.h"
 #include "cmd.h"
 #include "console.h"

source/locs.c

@@ -29,8 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <limits.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -38,6 +36,8 @@
 # include <strings.h>
 #endif
 
+#include <limits.h>
+
 #include "client.h"
 #include "console.h"
 #include "locs.h"

source/menu.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif

source/model_brush.c

@@ -32,8 +32,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <math.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -41,6 +39,9 @@
 # include <strings.h>
 #endif
 
+#include <math.h>
+
+
 #include "checksum.h"
 #include "cvar.h"
 #include "model.h"

source/msg.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif

source/net_udp6.c

@@ -59,6 +59,7 @@
 #ifndef _WIN32
 # include <unistd.h>
 #endif
+
 #include <sys/types.h>
 
 #ifdef HAVE_STRING_H

source/pcx.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif

source/pr_edict.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif

source/qargs.c

@@ -32,13 +32,13 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <assert.h>

source/qfgl_ext.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_DLFCN_H
 # include <dlfcn.h>
 #endif

source/quakefs.c

@@ -29,26 +29,19 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdlib.h>
-#include <stdarg.h>
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-
-#include <ctype.h>
-
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
+#include <stdlib.h>
+#include <stdarg.h>
+#include <ctype.h>
 #include <fcntl.h>
 #include <dirent.h>
 

source/quakeio.c

@@ -31,12 +31,9 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_MALLOC_H
 # include <malloc.h>
 #endif
-#include <stdarg.h>
-#include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -55,6 +52,9 @@
 #ifdef _MSC_VER
 # define _POSIX_
 #endif
+
+#include <stdarg.h>
+#include <stdlib.h>
 #include <limits.h>
 
 #include "quakefs.h"

source/r_sprite.c

@@ -29,13 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
 # include <string.h>
 #endif
+
 #include <math.h>
 
 #include "console.h"

source/sbar.c

@@ -29,8 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -38,6 +36,8 @@
 # include <strings.h>
 #endif
 
+#include <stdlib.h>
+
 #include "bothdefs.h"
 #include "cl_cam.h"
 #include "client.h"

source/screen.c

@@ -29,8 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <time.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -38,6 +36,8 @@
 # include <strings.h>
 #endif
 
+#include <time.h>
+
 #include "cl_parse.h"
 #include "client.h"
 #include "cmd.h"

source/sizebuf.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif

source/snd_alsa_0_5.c

@@ -30,12 +30,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdio.h>
-#include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+
+#include <stdio.h>
+#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #ifdef HAVE_SYS_IOCTL_H

source/snd_disk.c

@@ -30,12 +30,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdio.h>
-#include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+
+#include <stdio.h>
+#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/types.h>
 

source/snd_dma.c

@@ -29,13 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
+
 #include <stdlib.h>
 
 #include "client.h"

source/snd_mem.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif

source/snd_sdl.c

@@ -29,6 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
 #include <SDL_audio.h>
 #include <SDL_byteorder.h>
 

source/snd_sun.c

@@ -31,10 +31,10 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif 
-
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/types.h>

source/sv_ccmds.c

@@ -29,8 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -38,6 +36,8 @@
 # include <strings.h>
 #endif
 
+#include <stdlib.h>
+
 #include "bothdefs.h"
 #include "cmd.h"
 #include "msg.h"

source/sv_ents.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif

source/sv_init.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif

source/sv_main.c

@@ -29,9 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdarg.h>
-#include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -39,6 +36,9 @@
 # include <strings.h>
 #endif
 
+#include <stdarg.h>
+#include <stdlib.h>
+
 #include "bothdefs.h"
 #include "buildnum.h"
 #include "cmd.h"

source/sv_pr_cmds.c

@@ -29,8 +29,9 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
+#ifdef HAVE_STRING_H
 # include <string.h>
+#endif
 
 #include "cmd.h"
 #include "msg.h"

source/sv_send.c

@@ -29,9 +29,11 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
 
 #include <stdarg.h>
-#include <string.h>
 #include <stdlib.h>
 #include <time.h>
 

source/sv_sys_unix.c

@@ -30,6 +30,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -38,12 +44,6 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 
 #include "cvar.h"
 #include "qargs.h"

source/teamplay.c

@@ -29,13 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
+
 #include <errno.h>
 
 #include "bothdefs.h"

source/tga.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif

source/vid_fbdev.c

@@ -39,7 +39,7 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#if defined(HAVE_SYS_IO_H)
+#ifdef HAVE_SYS_IO_H
 # include <sys/io.h>
 #elif defined(HAVE_ASM_IO_H)
 # include <asm/io.h>

source/vid_win.c

@@ -29,6 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
 #include <windows.h>
 
 #include "vid.h"

source/world.c

@@ -29,9 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdio.h>
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -39,6 +36,8 @@
 # include <strings.h>
 #endif
 
+#include <stdio.h>
+
 #include "commdef.h"
 #include "console.h"
 #include "crc.h"

source/zone.c

@@ -29,9 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdlib.h>
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -39,6 +36,8 @@
 # include <strings.h>
 #endif
 
+#include <stdlib.h>
+
 #include "cmd.h"
 #include "console.h"
 #include "qargs.h"