Cleanup: Replace fseek() calls with BLI_fseek()
The fseek() function on Windows only accepts a 32-bit long offset argument. Because of this we have our own version, BLI_fseek(), which will use 64-bit _fseeki64() on Windows. This patch just replaces some fseek() calls with BLI_fseek(). Differential Revision: https://developer.blender.org/D11430 Reviewed by Brecht Van Lommel
This commit is contained in:
@@ -66,7 +66,7 @@ static unsigned long ft_ansi_stream_io(FT_Stream stream,
|
||||
file = STREAM_FILE(stream);
|
||||
|
||||
if (stream->pos != offset) {
|
||||
fseek(file, offset, SEEK_SET);
|
||||
BLI_fseek(file, offset, SEEK_SET);
|
||||
}
|
||||
|
||||
return fread(buffer, 1, count, file);
|
||||
@@ -93,7 +93,7 @@ static FT_Error FT_Stream_Open__win32_compat(FT_Stream stream, const char *filep
|
||||
return FT_THROW(Cannot_Open_Resource);
|
||||
}
|
||||
|
||||
fseek(file, 0, SEEK_END);
|
||||
BLI_fseek(file, 0LL, SEEK_END);
|
||||
stream->size = ftell(file);
|
||||
if (!stream->size) {
|
||||
fprintf(stderr,
|
||||
@@ -104,7 +104,7 @@ static FT_Error FT_Stream_Open__win32_compat(FT_Stream stream, const char *filep
|
||||
return FT_THROW(Cannot_Open_Stream);
|
||||
}
|
||||
|
||||
fseek(file, 0, SEEK_SET);
|
||||
BLI_fseek(file, 0LL, SEEK_SET);
|
||||
|
||||
stream->descriptor.pointer = file;
|
||||
stream->read = ft_ansi_stream_io;
|
||||
|
@@ -167,7 +167,7 @@ static bool cdf_read_header(CDataFile *cdf)
|
||||
offset += header->structbytes;
|
||||
header->structbytes = sizeof(CDataFileHeader);
|
||||
|
||||
if (fseek(f, offset, SEEK_SET) != 0) {
|
||||
if (BLI_fseek(f, offset, SEEK_SET) != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -201,7 +201,7 @@ static bool cdf_read_header(CDataFile *cdf)
|
||||
mesh->structbytes = sizeof(CDataFileMeshHeader);
|
||||
}
|
||||
|
||||
if (fseek(f, offset, SEEK_SET) != 0) {
|
||||
if (BLI_fseek(f, offset, SEEK_SET) != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -233,7 +233,7 @@ static bool cdf_read_header(CDataFile *cdf)
|
||||
offset += layer->structbytes;
|
||||
layer->structbytes = sizeof(CDataFileLayer);
|
||||
|
||||
if (fseek(f, offset, SEEK_SET) != 0) {
|
||||
if (BLI_fseek(f, offset, SEEK_SET) != 0) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -321,7 +321,7 @@ bool cdf_read_layer(CDataFile *cdf, CDataFileLayer *blay)
|
||||
offset += cdf->layer[a].datasize;
|
||||
}
|
||||
|
||||
return (fseek(cdf->readf, offset, SEEK_SET) == 0);
|
||||
return (BLI_fseek(cdf->readf, offset, SEEK_SET) == 0);
|
||||
}
|
||||
|
||||
bool cdf_read_data(CDataFile *cdf, unsigned int size, void *data)
|
||||
|
@@ -171,7 +171,7 @@ size_t BLI_gzip_mem_to_file_at_pos(
|
||||
z_stream strm;
|
||||
unsigned char out[CHUNK];
|
||||
|
||||
fseek(file, gz_stream_offset, 0);
|
||||
BLI_fseek(file, gz_stream_offset, 0);
|
||||
|
||||
strm.zalloc = Z_NULL;
|
||||
strm.zfree = Z_NULL;
|
||||
@@ -217,7 +217,7 @@ size_t BLI_ungzip_file_to_mem_at_pos(void *buf, size_t len, FILE *file, size_t g
|
||||
size_t chunk = 256 * 1024;
|
||||
unsigned char in[CHUNK];
|
||||
|
||||
fseek(file, gz_stream_offset, 0);
|
||||
BLI_fseek(file, gz_stream_offset, 0);
|
||||
|
||||
strm.zalloc = Z_NULL;
|
||||
strm.zfree = Z_NULL;
|
||||
|
@@ -518,7 +518,7 @@ static size_t inflate_file_to_imbuf(ImBuf *ibuf, FILE *file, DiskCacheHeaderEntr
|
||||
|
||||
static bool seq_disk_cache_read_header(FILE *file, DiskCacheHeader *header)
|
||||
{
|
||||
fseek(file, 0, 0);
|
||||
BLI_fseek(file, 0LL, SEEK_SET);
|
||||
const size_t num_items_read = fread(header, sizeof(*header), 1, file);
|
||||
if (num_items_read < 1) {
|
||||
BLI_assert(!"unable to read disk cache header");
|
||||
@@ -540,7 +540,7 @@ static bool seq_disk_cache_read_header(FILE *file, DiskCacheHeader *header)
|
||||
|
||||
static size_t seq_disk_cache_write_header(FILE *file, DiskCacheHeader *header)
|
||||
{
|
||||
fseek(file, 0, 0);
|
||||
BLI_fseek(file, 0LL, SEEK_SET);
|
||||
return fwrite(header, sizeof(*header), 1, file);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user