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

Browse Source
This commit is contained in:
Ward Fisher 2012-09-26 20:30:19 +00:00
parent 98675a8047
commit f2d2ddf435
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libdispatch/nctime.c
View File

@ -16,12 +16,6 @@
* the CDMS library, get the original sources from LLNL.
*/
/* Disable a couple warnings which only
appear on Visual Studio. */
#ifdef _MSC_VER
#pragma warning ( disable: 4244 )
#endif
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>

19
libsrc4/nc4file.c
View File

@ -10,9 +10,10 @@ COPYRIGHT file for copying and redistribution conditions.
#include "nc4internal.h"
#include "nc.h"
#include "H5DSpublic.h"
#include <H5DSpublic.h>
#include "nc4dispatch.h"
#include "ncdispatch.h"
#ifdef USE_HDF4
#include <mfhdf.h>
#endif
@ -383,10 +384,10 @@ NC4_create(const char* path, int cmode, size_t initialsz, int basepe,
/* If this is our first file, turn off HDF5 error messages. */
if (virgin)
{
if (H5Eset_auto(NULL, NULL) < 0)
LOG((0, "Couldn't turn off HDF5 error messages!"));
LOG((1, "HDF5 error messages have been turned off."));
virgin = 0;
if (H5Eset_auto(NULL, NULL) < 0)
LOG((0, "Couldn't turn off HDF5 error messages!"));
LOG((1, "HDF5 error messages have been turned off."));
virgin = 0;
}
/* Check the cmode for validity. */
@ -2629,10 +2630,10 @@ NC4_open(const char *path, int mode, int basepe, size_t *chunksizehintp,
/* If this is our first file, turn off HDF5 error messages. */
if (virgin)
{
if (H5Eset_auto(NULL, NULL) < 0)
LOG((0, "Couldn't turn off HDF5 error messages!"));
LOG((1, "HDF5 error messages turned off!"));
virgin = 0;
if (H5Eset_auto(NULL, NULL) < 0)
LOG((0, "Couldn't turn off HDF5 error messages!"));
LOG((1, "HDF5 error messages turned off!"));
virgin = 0;
}
/* Check the mode for validity. First make sure only certain bits