mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ejh_hdf4_more

Browse Source
This commit is contained in:
Ward Fisher 2018-03-05 13:02:20 -07:00 committed by GitHub
commit e2e09a358b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libdispatch/dfile.c
View File

@ -21,6 +21,8 @@
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#include <unistd.h> /* lseek() */
#include "ncdispatch.h"
#include "netcdf_mem.h"
#include "ncwinpath.h"
@ -2226,17 +2228,17 @@ openmagic(struct MagicFile* file)
{status = errno; goto done;}
/* Get its length */
{
#ifdef _MSC_VER
int fd = fileno(file->fp);
#ifdef _MSC_VER
__int64 len64 = _filelengthi64(fd);
if(len64 < 0)
{status = errno; goto done;}
file->filelen = (long long)len64;
#else
long size;
if((status = fseek(file->fp, 0L, SEEK_END)) < 0)
off_t size;
size = lseek(fd, 0, SEEK_END);
if(size == -1)
{status = errno; goto done;}
size = ftell(file->fp);
file->filelen = (long long)size;
#endif
rewind(file->fp);
@ -2269,12 +2271,8 @@ readmagic(struct MagicFile* file, long pos, char* magic)
if (file->use_parallel) {
MPI_Status mstatus;
int retval;
MPI_Offset offset;
offset = pos;
if((retval = MPI_File_seek(file->fh, offset, MPI_SEEK_SET)) != MPI_SUCCESS)
{status = NC_EPARINIT; goto done;}
if((retval = MPI_File_read(file->fh, magic, MAGIC_NUMBER_LEN, MPI_CHAR,
&mstatus)) != MPI_SUCCESS)
if((retval = MPI_File_read_at_all(file->fh, pos, magic,
MAGIC_NUMBER_LEN, MPI_CHAR, &mstatus)) != MPI_SUCCESS)
{status = NC_EPARINIT; goto done;}
goto done;
}