From 9240f04dc7ad6791ca010508b214619a79c895bf Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Wed, 28 Feb 2018 11:10:35 -0700 Subject: [PATCH] 1. make uptodate wrt master 2. fix lgtm alert 4. fix problem in examples/C/hdf5plugins where a file overwrite problem occurs. --- examples/C/hdf5plugins/Makefile.am | 5 ++++- libsrc/memio.c | 8 -------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/examples/C/hdf5plugins/Makefile.am b/examples/C/hdf5plugins/Makefile.am index c8fa76349..5454dc9ec 100644 --- a/examples/C/hdf5plugins/Makefile.am +++ b/examples/C/hdf5plugins/Makefile.am @@ -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} diff --git a/libsrc/memio.c b/libsrc/memio.c index 8176b980e..22b753f8a 100644 --- a/libsrc/memio.c +++ b/libsrc/memio.c @@ -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 */