removed old fileutil stuff
This commit is contained in:
Bradley Bell
parent
aff1f6ef5c
commit
ac98cd5b67
|
|
@ -1,5 +1,8 @@
|
|||
2003-06-15 Bradley Bell <btb@icculus.org>
|
||||
|
||||
* include/fileutil.h, misc/Makefile.am, misc/fileutil.c: removed
|
||||
old fileutil stuff
|
||||
|
||||
* 2d/pcx.c, include/strio.h, main/ai.c, main/ai.h,
|
||||
main/cntrlcen.c, main/config.c, main/gamesave.c, main/gameseq.c,
|
||||
main/movie.c, main/multi.c, main/network.c, main/newdemo.c,
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
/*
|
||||
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
||||
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
||||
END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
|
||||
ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
|
||||
IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
|
||||
SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
|
||||
FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
|
||||
CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS
|
||||
AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
|
||||
COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||
*/
|
||||
|
||||
#ifndef _FILEUTIL_
|
||||
#define _FILEUTIL_
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "fix.h"
|
||||
|
||||
// routines which read basic data types
|
||||
extern byte file_read_byte(FILE *fp);
|
||||
extern short file_read_short(FILE *fp);
|
||||
extern int file_read_int(FILE *fp);
|
||||
extern fix file_read_fix(FILE *fp);
|
||||
extern void file_read_string(char *s, FILE *f);
|
||||
|
||||
// routines which write basic data types
|
||||
extern int file_write_byte(byte b, FILE *fp);
|
||||
extern int file_write_short(short s, FILE *fp);
|
||||
extern int file_write_int(int i, FILE *fp);
|
||||
extern int file_write_fix(fix f, FILE *fp);
|
||||
extern void file_write_string(char *s, FILE *f);
|
||||
|
||||
#endif
|
||||
|
|
@ -3,7 +3,7 @@ INCLUDES = -I $(top_srcdir)/include
|
|||
|
||||
libmisc_a_SOURCES = \
|
||||
args.c error.c strio.c \
|
||||
d_io.c hash.c strutil.c fileutil.c
|
||||
d_io.c hash.c strutil.c
|
||||
|
||||
# checker.c
|
||||
|
||||
|
|
|
|||
124
misc/fileutil.c
124
misc/fileutil.c
|
|
@ -1,124 +0,0 @@
|
|||
/* $Id: fileutil.c,v 1.7 2003-04-12 00:11:46 btb Exp $ */
|
||||
/*
|
||||
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
||||
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
||||
END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
|
||||
ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
|
||||
IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
|
||||
SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
|
||||
FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
|
||||
CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS
|
||||
AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
|
||||
COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||
*/
|
||||
|
||||
/*
|
||||
*
|
||||
* utilities for file manipulation
|
||||
*
|
||||
* Old Log:
|
||||
* Revision 1.6 1995/10/30 11:09:51 allender
|
||||
* use FILE, not CFILE on the write* routines
|
||||
*
|
||||
* Revision 1.5 1995/05/11 13:00:34 allender
|
||||
* added write functions which swap bytes
|
||||
*
|
||||
* Revision 1.4 1995/05/04 20:10:38 allender
|
||||
* remove include for fcntl
|
||||
*
|
||||
* Revision 1.3 1995/04/26 10:14:39 allender
|
||||
* added byteswap header file
|
||||
*
|
||||
* Revision 1.2 1995/04/26 10:13:21 allender
|
||||
*
|
||||
* Revision 1.1 1995/03/30 15:02:34 allender
|
||||
* Initial revision
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <conf.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "fileutil.h"
|
||||
#include "fix.h"
|
||||
#include "byteswap.h"
|
||||
#include "error.h"
|
||||
|
||||
byte file_read_byte(FILE *fp)
|
||||
{
|
||||
byte b;
|
||||
|
||||
if (fread(&b, 1, 1, fp) != 1)
|
||||
Error("Error reading byte in file_read_byte()");
|
||||
return b;
|
||||
}
|
||||
|
||||
short file_read_short(FILE *fp)
|
||||
{
|
||||
short s;
|
||||
|
||||
if (fread(&s, 2, 1, fp) != 1)
|
||||
Error("Error reading short in file_read_short()");
|
||||
return INTEL_SHORT(s);
|
||||
}
|
||||
|
||||
int file_read_int(FILE *fp)
|
||||
{
|
||||
uint i;
|
||||
|
||||
if (fread(&i, 4, 1, fp) != 1)
|
||||
Error("Error reading int in file_read_int()");
|
||||
return INTEL_INT(i);
|
||||
}
|
||||
|
||||
fix file_read_fix(FILE *fp)
|
||||
{
|
||||
fix f;
|
||||
|
||||
if (fread(&f, 4, 1, fp) != 1)
|
||||
Error("Error reading fix in file_read_fix()");
|
||||
return INTEL_INT(f);
|
||||
}
|
||||
|
||||
void file_read_string(char *s, FILE *f)
|
||||
{
|
||||
if (feof(f))
|
||||
*s = 0;
|
||||
else
|
||||
do
|
||||
*s = fgetc(f);
|
||||
while (!feof(f) && *s++!=0);
|
||||
}
|
||||
|
||||
int file_write_byte(byte b, FILE *fp)
|
||||
{
|
||||
return (fwrite(&b, 1, 1, fp));
|
||||
}
|
||||
|
||||
int file_write_short(short s, FILE *fp)
|
||||
{
|
||||
s = INTEL_SHORT(s);
|
||||
return (fwrite(&s, 2, 1, fp));
|
||||
}
|
||||
|
||||
int file_write_int(int i, FILE *fp)
|
||||
{
|
||||
i = INTEL_INT(i);
|
||||
return (fwrite(&i, 4, 1, fp));
|
||||
}
|
||||
|
||||
int file_write_fix(fix f, FILE *fp)
|
||||
{
|
||||
f = (fix)INTEL_INT((int)f);
|
||||
return (fwrite(&f, 4, 1, fp));
|
||||
}
|
||||
|
||||
void file_write_string(char *s, FILE *f)
|
||||
{
|
||||
do
|
||||
fputc(*s,f);
|
||||
while (*s++!=0);
|
||||
}
|
||||
Loading…
Reference in a new issue