diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-11-24 16:24:53 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-11-24 16:24:53 (GMT) |
| commit | b0cecfab0433669085f71f36f6e5328f1b636f93 (patch) | |
| tree | b322f8e49fd1fa3a3ed426370c95d8cba9a20925 | |
| parent | 15eaced5b660cb8bf9f315c5fd330ea8186c489a (diff) | |
| download | hdf5-b0cecfab0433669085f71f36f6e5328f1b636f93.zip hdf5-b0cecfab0433669085f71f36f6e5328f1b636f93.tar.gz hdf5-b0cecfab0433669085f71f36f6e5328f1b636f93.tar.bz2 | |
[svn-r28457] Warning fixes in H5trace.c.
Tested on Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
serial only
| -rw-r--r-- | src/H5trace.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/H5trace.c b/src/H5trace.c index faf74da..6b3f90c 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -155,8 +155,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...) } /* end if */ /* Get time for event */ - if(HDfabs(first_time.etime) < 0.0000000001F) - /* That is == 0.0, but direct comparison between floats is bad */ + if(H5_DBL_ABS_EQUAL(first_time.etime, H5_DOUBLE(0.0))) H5_timer_begin(&first_time); if(H5_debug_g.ttimes) H5_timer_begin(&event_time); @@ -269,7 +268,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...) fprintf(out, "NULL"); } /* end if */ else { - hbool_t bool_var = va_arg(ap, hbool_t); /*lint !e732 Loss of sign not really occuring */ + /* Can't pass hbool_t to va_arg() */ + hbool_t bool_var = (hbool_t)va_arg(ap, int); /*lint !e732 Loss of sign not really occuring */ if(TRUE == bool_var) fprintf(out, "TRUE"); @@ -527,12 +527,16 @@ H5_trace(const double *returning, const char *func, const char *type, ...) fprintf(out, "H5D_CHUNK_IDX_BT2"); break; + case H5D_CHUNK_IDX_SINGLE: + fprintf(out, "H5D_CHUNK_IDX_SINGLE"); + break; + case H5D_CHUNK_IDX_NTYPES: fprintf(out, "ERROR: H5D_CHUNK_IDX_NTYPES (invalid value)"); break; default: - fprintf(out, "%ld", (long)idx); + fprintf(out, "UNKNOWN VALUE: %ld", (long)idx); break; } /* end switch */ } /* end else */ |