From d418524a2bca222a637e949555165847beea0c16 Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Sun, 1 Aug 2004 14:32:07 +0000 Subject: [PATCH] use portable ffilelength in cfile_size --- ChangeLog | 2 ++ cfile/cfile.c | 18 +++--------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf65ee67..f47b4e12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,8 @@ * arch/ogl/gr.c: use portable CFILE instead of POSIX file in write_bmp + * cfile/cfile.c: use portable ffilelength in cfile_size + 2004-06-26 Chris Taylor * main/gamemine.c, main/gamemine.h, main/gamesave.c: remove some diff --git a/cfile/cfile.c b/cfile/cfile.c index b0b09674..dd53d810 100644 --- a/cfile/cfile.c +++ b/cfile/cfile.c @@ -1,4 +1,4 @@ -/* $Id: cfile.c,v 1.23 2003-11-27 00:36:14 btb Exp $ */ +/* $Id: cfile.c,v 1.24 2004-08-01 14:32:07 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -313,27 +313,15 @@ int cfile_init(char *hogname) int cfile_size(char *hogname) { -#ifndef _WIN32_WCE CFILE *fp; - struct stat statbuf; + int size; fp = cfopen(hogname, "rb"); if (fp == NULL) return -1; - fstat(fileno(fp->file), &statbuf); - cfclose(fp); - return statbuf.st_size; -#else - CFILE *fp; - DWORD size; - - fp = cfopen(hogname, "rb"); - if (fp == NULL) - return -1; - size = GetFileSize(fileno(fp->file), NULL); + size = ffilelength(fp->file); cfclose(fp); return size; -#endif } /* -- 2.39.2