1. make uptodate wrt master

2. fix lgtm alert
4. fix problem in examples/C/hdf5plugins
   where a file overwrite problem occurs.
This commit is contained in:
Dennis Heimbigner 2018-02-28 11:10:35 -07:00
parent 618f786053
commit 9240f04dc7
2 changed files with 4 additions and 9 deletions

View File

@ -10,7 +10,10 @@ TARGETS = ${PLUGINSRC} ${BZIP2SRC}
BUILT_SOURCES = ${TARGETS}
${TARGETS}:
for x in ${TARGETS} ; do 'cp' -f ${top_srcdir}/nc_test4/hdf5plugins/$$x . ; done
for x in ${TARGETS} ; do \
rm -f ./$$x ; \
cp ${top_srcdir}/nc_test4/hdf5plugins/$$x . ; \
done
CLEANFILES = ${TARGETS}

View File

@ -152,14 +152,6 @@ memio_new(const char* path, int ioflags, off_t initialsize, ncio** nciopp, NCMEM
#endif
}
/* We need to catch errors.
sysconf, at least, can return a negative value
when there is an error. */
if(pagesize < 0) {
status = NC_EIO;
goto fail;
}
errno = 0;
/* Always force the allocated size to be a multiple of pagesize */