empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(write_file,allocate_memory): Convert to stdio.

Browse source
This commit is contained in:
Ron Koenderink 2005-03-01 13:50:56 +00:00
parent df7dc203c4
commit 826c14ef79
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/util/fairland.c
View file

@ -150,7 +150,7 @@ int **sectc; /* which sectors are on the coast? */
int *vector; /* used for measuring distances */ int *vector; /* used for measuring distances */
int *weight; /* used for placing mountains */ int *weight; /* used for placing mountains */
int *dsea, *dmoun; /* the dist to the ocean and mountain */ int *dsea, *dmoun; /* the dist to the ocean and mountain */
int the_file; /* the file we write everything to */ FILE *sect_fptr; /* the file we write everything to */
struct sctstr **sects; struct sctstr **sects;
struct sctstr *sectsbuf; struct sctstr *sectsbuf;
int fl_status; /* is anything wrong? */ int fl_status; /* is anything wrong? */
@ -411,9 +411,8 @@ allocate_memory(void)
{ {
int i; int i;
the_file = open(empfile[EF_SECTOR].file, O_RDWR | O_CREAT | O_TRUNC, sect_fptr = fopen(empfile[EF_SECTOR].file, "w");
0660); if (sect_fptr == NULL) {
if (the_file < 0) {
perror(empfile[EF_SECTOR].file); perror(empfile[EF_SECTOR].file);
return -1; return -1;
} }
@ -1094,16 +1093,16 @@ write_file(void)
{ {
int n; int n;
/* if ((n = write(the_file, sects, sizeof(sects))) < 0) { */ if ((n = fwrite((void *)sectsbuf, sizeof(struct sctstr),
if ((n = write(the_file, sectsbuf, YSIZE * XSIZE * sizeof(struct sctstr))) < 0) { YSIZE * XSIZE, sect_fptr)) <= 0) {
perror(empfile[EF_SECTOR].file); perror(empfile[EF_SECTOR].file);
return -1; return -1;
} }
if (n != (int)(YSIZE * XSIZE * sizeof(struct sctstr))) { if (n != YSIZE * XSIZE) {
printf("%s:partial write\n", empfile[EF_SECTOR].file); printf("%s:partial write\n", empfile[EF_SECTOR].file);
return -1; return -1;
} }
close(the_file); fclose(sect_fptr);
return 0; return 0;
} }