From 5f7b3d8cf2bd69b01258b8facdabc9b9de736555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Andersson?= Date: Tue, 3 May 2005 08:37:04 +0000 Subject: [PATCH] Use File::size() instead of stat() to find the size of a file. svn-id: r17900 --- gob/dataio.cpp | 12 +++++++----- gob/dataio.h | 1 - 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gob/dataio.cpp b/gob/dataio.cpp index 84a09c97e78..c01c36083ec 100644 --- a/gob/dataio.cpp +++ b/gob/dataio.cpp @@ -320,17 +320,20 @@ void data_seekData(int16 handle, int32 pos, int16 from) { int32 data_getDataSize(const char *name) { char buf[128]; int32 chunkSz; - struct stat statBuf; + File file; strcpy(buf, name); chunkSz = data_getChunkSize(buf); if (chunkSz >= 0) return chunkSz; - if (stat(buf, &statBuf) == -1) - error("data_getDataSize: Can't find data (%s)", name); + if (!file.open(buf)) + error("data_getDataSize: Can't find data(%s)", name); - return statBuf.st_size; + chunkSz = file.size(); + file.close(); + + return chunkSz; } char *data_getData(const char *path) { @@ -359,7 +362,6 @@ char *data_getData(const char *path) { data_readData(handle, ptr, size); data_closeData(handle); return data; - } char *data_getSmallData(const char *path) { diff --git a/gob/dataio.h b/gob/dataio.h index 27efbb006d4..d7d59170161 100644 --- a/gob/dataio.h +++ b/gob/dataio.h @@ -23,7 +23,6 @@ #define GOB_DATAIO_H #include "common/file.h" -#include namespace Gob {