summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-07-30 17:53:42 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-07-30 17:53:42 (GMT)
commit361586a90e00fb4f13fcb85dff669f13ff872b94 (patch)
treed276183d04e201c82e7f38a2b22007739974a2cb
parente1ceea54ff06ffef0029b20007cd7685e000fdec (diff)
downloadhdf5-361586a90e00fb4f13fcb85dff669f13ff872b94.zip
hdf5-361586a90e00fb4f13fcb85dff669f13ff872b94.tar.gz
hdf5-361586a90e00fb4f13fcb85dff669f13ff872b94.tar.bz2
[svn-r17276] Description:
Clean up compiler warnings Tested on: Mac OS X/32 10.5.7 (amazon) Too minor to require h5committest
-rw-r--r--src/H5AC.c2
-rw-r--r--src/H5E.c1
-rw-r--r--src/H5trace.c463
3 files changed, 244 insertions, 222 deletions
diff --git a/src/H5AC.c b/src/H5AC.c
index a01543c..d613991 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -3264,7 +3264,7 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr)
if ( ( config_ptr->evictions_enabled == FALSE ) &&
( ( config_ptr->incr_mode != H5C_incr__off ) ||
( config_ptr->flash_incr_mode != H5C_flash_incr__off ) ||
- ( config_ptr->incr_mode != H5C_decr__off ) ) ) {
+ ( config_ptr->decr_mode != H5C_decr__off ) ) ) {
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
"Can't disable evictions while auto-resize is enabled.")
diff --git a/src/H5E.c b/src/H5E.c
index dc90a5a..fa9bf58 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -1273,7 +1273,6 @@ H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line,
{
va_list ap; /* Varargs info */
H5E_t *estack; /* Pointer to error stack to modify */
- H5E_msg_t *maj_ptr, *min_ptr; /* Pointer to major and minor error info */
#ifndef H5_HAVE_VASPRINTF
int tmp_len; /* Current size of description buffer */
int desc_len; /* Actual length of description when formatted */
diff --git a/src/H5trace.c b/src/H5trace.c
index 6e2578b..172a7f7 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -293,234 +293,257 @@ H5_trace (const double *returning, const char *func, const char *type, ...)
break;
case 'D':
- switch (type[1]) {
- case 'a':
- if (ptr) {
- if (vp) {
- fprintf (out, "0x%lx", (unsigned long)vp);
- } else {
- fprintf(out, "NULL");
- }
- } else {
- H5D_alloc_time_t alloc_time = va_arg (ap, H5D_alloc_time_t); /*lint !e64 Type mismatch not really occuring */
- switch (alloc_time) {
- case H5D_ALLOC_TIME_ERROR:
- fprintf (out, "H5D_ALLOC_TIME_ERROR");
- break;
- case H5D_ALLOC_TIME_DEFAULT:
- fprintf (out, "H5D_ALLOC_TIME_DEFAULT");
- break;
- case H5D_ALLOC_TIME_EARLY:
- fprintf (out, "H5D_ALLOC_TIME_EARLY");
- break;
- case H5D_ALLOC_TIME_LATE:
- fprintf (out, "H5D_ALLOC_TIME_LATE");
- break;
- case H5D_ALLOC_TIME_INCR:
- fprintf (out, "H5D_ALLOC_TIME_INCR");
- break;
- default:
- fprintf (out, "%ld", (long)alloc_time);
- break;
- }
- }
- break;
+ switch(type[1]) {
+ case 'a':
+ if(ptr) {
+ if(vp)
+ fprintf (out, "0x%lx", (unsigned long)vp);
+ else
+ fprintf(out, "NULL");
+ } /* end if */
+ else {
+ H5D_alloc_time_t alloc_time = (H5D_alloc_time_t)va_arg(ap, int);
- case 'c':
- if (ptr) {
- if (vp) {
- fprintf (out, "0x%lx", (unsigned long)vp);
- } else {
- fprintf(out, "NULL");
- }
- } else {
- H5FD_mpio_collective_opt_t opt= va_arg(ap, H5FD_mpio_collective_opt_t); /*lint !e64 Type mismatch not really occuring */
- switch (opt) {
- case H5FD_MPIO_COLLECTIVE_IO:
- fprintf (out, "H5FD_MPIO_COLLECTIVE_IO");
- break;
- case H5FD_MPIO_INDIVIDUAL_IO:
- fprintf (out, "H5FD_MPIO_INDIVIDUAL_IO");
- break;
- default:
- fprintf (out, "%ld", (long)opt);
- break;
- }
- }
- break;
+ switch(alloc_time) {
+ case H5D_ALLOC_TIME_ERROR:
+ fprintf(out, "H5D_ALLOC_TIME_ERROR");
+ break;
- case 'f':
- if (ptr) {
- if (vp) {
- fprintf (out, "0x%lx", (unsigned long)vp);
- } else {
- fprintf(out, "NULL");
- }
- } else {
- H5D_fill_time_t fill_time = va_arg (ap, H5D_fill_time_t); /*lint !e64 Type mismatch not really occuring */
- switch (fill_time) {
- case H5D_FILL_TIME_ERROR:
- fprintf (out, "H5D_FILL_TIME_ERROR");
- break;
- case H5D_FILL_TIME_ALLOC:
- fprintf (out, "H5D_FILL_TIME_ALLOC");
- break;
- case H5D_FILL_TIME_NEVER:
- fprintf (out, "H5D_FILL_TIME_NEVER");
- break;
- case H5D_FILL_TIME_IFSET:
- fprintf (out, "H5D_FILL_TIME_IFSET");
- break;
- default:
- fprintf (out, "%ld", (long)fill_time);
- break;
- }
- }
- break;
+ case H5D_ALLOC_TIME_DEFAULT:
+ fprintf(out, "H5D_ALLOC_TIME_DEFAULT");
+ break;
- case 'F':
- if (ptr) {
- if (vp) {
- fprintf (out, "0x%lx", (unsigned long)vp);
- } else {
- fprintf(out, "NULL");
- }
- } else {
- H5D_fill_value_t fill_value = va_arg (ap, H5D_fill_value_t); /*lint !e64 Type mismatch not really occuring */
- switch (fill_value) {
- case H5D_FILL_VALUE_ERROR:
- fprintf (out, "H5D_FILL_VALUE_ERROR");
- break;
- case H5D_FILL_VALUE_UNDEFINED:
- fprintf (out, "H5D_FILL_VALUE_UNDEFINED");
- break;
- case H5D_FILL_VALUE_DEFAULT:
- fprintf (out, "H5D_FILL_VALUE_DEFAULT");
- break;
- case H5D_FILL_VALUE_USER_DEFINED:
- fprintf (out, "H5D_FILL_VALUE_USER_DEFINED");
- break;
- default:
- fprintf (out, "%ld", (long)fill_value);
- break;
- }
- }
- break;
+ case H5D_ALLOC_TIME_EARLY:
+ fprintf(out, "H5D_ALLOC_TIME_EARLY");
+ break;
- case 'h':
- if (ptr) {
- if (vp) {
- fprintf (out, "0x%lx", (unsigned long)vp);
- } else {
- fprintf(out, "NULL");
- }
- } else {
- H5FD_mpio_chunk_opt_t opt = va_arg(ap, H5FD_mpio_chunk_opt_t); /*lint !e64 Type mismatch not really occuring */
- switch (opt) {
- case H5FD_MPIO_CHUNK_DEFAULT:
- fprintf (out, "H5FD_MPIO_CHUNK_DEFAULT");
- break;
- case H5FD_MPIO_CHUNK_ONE_IO:
- fprintf (out, "H5FD_MPIO_CHUNK_ONE_IO");
- break;
- case H5FD_MPIO_CHUNK_MULTI_IO:
- fprintf (out, "H5FD_MPIO_CHUNK_MULTI_IO");
- break;
- default:
- fprintf (out, "%ld", (long)opt);
- break;
- }
- }
- break;
+ case H5D_ALLOC_TIME_LATE:
+ fprintf(out, "H5D_ALLOC_TIME_LATE");
+ break;
- case 'l':
- if (ptr) {
- if (vp) {
- fprintf (out, "0x%lx", (unsigned long)vp);
- } else {
- fprintf(out, "NULL");
- }
- } else {
- H5D_layout_t layout = va_arg (ap, H5D_layout_t); /*lint !e64 Type mismatch not really occuring */
- switch (layout) {
- case H5D_LAYOUT_ERROR:
- fprintf (out, "H5D_LAYOUT_ERROR");
- break;
- case H5D_COMPACT:
- fprintf (out, "H5D_COMPACT");
- break;
- case H5D_CONTIGUOUS:
- fprintf (out, "H5D_CONTIGUOUS");
- break;
- case H5D_CHUNKED:
- fprintf (out, "H5D_CHUNKED");
- break;
- case H5D_NLAYOUTS:
- fprintf (out, "H5D_NLAYOUTS");
- break;
- default:
- fprintf (out, "%ld", (long)layout);
- break;
- }
- }
- break;
+ case H5D_ALLOC_TIME_INCR:
+ fprintf(out, "H5D_ALLOC_TIME_INCR");
+ break;
- case 's':
- if (ptr) {
- if (vp) {
- fprintf (out, "0x%lx", (unsigned long)vp);
- } else {
- fprintf(out, "NULL");
- }
- } else {
- H5D_space_status_t space_status = va_arg(ap, H5D_space_status_t); /*lint !e64 Type mismatch not really occuring */
- switch (space_status) {
- case H5D_SPACE_STATUS_NOT_ALLOCATED:
- fprintf (out, "H5D_SPACE_STATUS_NOT_ALLOCATED");
- break;
- case H5D_SPACE_STATUS_PART_ALLOCATED:
- fprintf (out, "H5D_SPACE_STATUS_PART_ALLOCATED");
- break;
- case H5D_SPACE_STATUS_ALLOCATED:
- fprintf (out, "H5D_SPACE_STATUS_ALLOCATED");
- break;
- case H5D_SPACE_STATUS_ERROR:
- fprintf (out, "H5D_SPACE_STATUS_ERROR");
- break;
- default:
- fprintf (out, "%ld", (long)space_status);
- break;
- }
- }
- break;
+ default:
+ fprintf(out, "%ld", (long)alloc_time);
+ break;
+ } /* end switch */
+ } /* end else */
+ break;
- case 't':
- if (ptr) {
- if (vp) {
- fprintf (out, "0x%lx", (unsigned long)vp);
- } else {
- fprintf(out, "NULL");
- }
- } else {
- H5FD_mpio_xfer_t transfer = va_arg(ap, H5FD_mpio_xfer_t); /*lint !e64 Type mismatch not really occuring */
- switch (transfer) {
- case H5FD_MPIO_INDEPENDENT:
- fprintf (out, "H5FD_MPIO_INDEPENDENT");
- break;
- case H5FD_MPIO_COLLECTIVE:
- fprintf (out, "H5FD_MPIO_COLLECTIVE");
- break;
- default:
- fprintf (out, "%ld", (long)transfer);
- break;
- }
- }
- break;
+ case 'c':
+ if(ptr) {
+ if(vp)
+ fprintf(out, "0x%lx", (unsigned long)vp);
+ else
+ fprintf(out, "NULL");
+ } /* end if */
+ else {
+ H5FD_mpio_collective_opt_t opt = (H5FD_mpio_collective_opt_t)va_arg(ap, int);
- default:
- fprintf (out, "BADTYPE(D%c)", type[1]);
- goto error;
- }
+ switch(opt) {
+ case H5FD_MPIO_COLLECTIVE_IO:
+ fprintf(out, "H5FD_MPIO_COLLECTIVE_IO");
+ break;
+
+ case H5FD_MPIO_INDIVIDUAL_IO:
+ fprintf(out, "H5FD_MPIO_INDIVIDUAL_IO");
+ break;
+
+ default:
+ fprintf(out, "%ld", (long)opt);
+ break;
+ } /* end switch */
+ } /* end else */
+ break;
+
+ case 'f':
+ if(ptr) {
+ if(vp)
+ fprintf(out, "0x%lx", (unsigned long)vp);
+ else
+ fprintf(out, "NULL");
+ } /* end if */
+ else {
+ H5D_fill_time_t fill_time = (H5D_fill_time_t)va_arg(ap, int);
+
+ switch(fill_time) {
+ case H5D_FILL_TIME_ERROR:
+ fprintf(out, "H5D_FILL_TIME_ERROR");
+ break;
+
+ case H5D_FILL_TIME_ALLOC:
+ fprintf(out, "H5D_FILL_TIME_ALLOC");
+ break;
+
+ case H5D_FILL_TIME_NEVER:
+ fprintf(out, "H5D_FILL_TIME_NEVER");
+ break;
+
+ case H5D_FILL_TIME_IFSET:
+ fprintf(out, "H5D_FILL_TIME_IFSET");
+ break;
+
+ default:
+ fprintf(out, "%ld", (long)fill_time);
+ break;
+ } /* end switch */
+ } /* end else */
+ break;
+
+ case 'F':
+ if(ptr) {
+ if(vp)
+ fprintf(out, "0x%lx", (unsigned long)vp);
+ else
+ fprintf(out, "NULL");
+ } /* end if */
+ else {
+ H5D_fill_value_t fill_value = (H5D_fill_value_t)va_arg(ap, int);
+
+ switch(fill_value) {
+ case H5D_FILL_VALUE_ERROR:
+ fprintf(out, "H5D_FILL_VALUE_ERROR");
+ break;
+
+ case H5D_FILL_VALUE_UNDEFINED:
+ fprintf(out, "H5D_FILL_VALUE_UNDEFINED");
+ break;
+
+ case H5D_FILL_VALUE_DEFAULT:
+ fprintf(out, "H5D_FILL_VALUE_DEFAULT");
+ break;
+
+ case H5D_FILL_VALUE_USER_DEFINED:
+ fprintf(out, "H5D_FILL_VALUE_USER_DEFINED");
+ break;
+
+ default:
+ fprintf(out, "%ld", (long)fill_value);
+ break;
+ } /* end switch */
+ } /* end else */
+ break;
+
+ case 'h':
+ if(ptr) {
+ if(vp)
+ fprintf(out, "0x%lx", (unsigned long)vp);
+ else
+ fprintf(out, "NULL");
+ } /* end if */
+ else {
+ H5FD_mpio_chunk_opt_t opt = (H5FD_mpio_chunk_opt_t)va_arg(ap, int);
+
+ switch(opt) {
+ case H5FD_MPIO_CHUNK_DEFAULT:
+ fprintf(out, "H5FD_MPIO_CHUNK_DEFAULT");
+ break;
+
+ case H5FD_MPIO_CHUNK_ONE_IO:
+ fprintf(out, "H5FD_MPIO_CHUNK_ONE_IO");
+ break;
+
+ case H5FD_MPIO_CHUNK_MULTI_IO:
+ fprintf(out, "H5FD_MPIO_CHUNK_MULTI_IO");
+ break;
+
+ default:
+ fprintf(out, "%ld", (long)opt);
+ break;
+ } /* end switch */
+ } /* end else */
+ break;
+
+ case 'l':
+ if (ptr) {
+ if (vp) {
+ fprintf (out, "0x%lx", (unsigned long)vp);
+ } else {
+ fprintf(out, "NULL");
+ }
+ } else {
+ H5D_layout_t layout = va_arg (ap, H5D_layout_t); /*lint !e64 Type mismatch not really occuring */
+ switch (layout) {
+ case H5D_LAYOUT_ERROR:
+ fprintf (out, "H5D_LAYOUT_ERROR");
+ break;
+ case H5D_COMPACT:
+ fprintf (out, "H5D_COMPACT");
+ break;
+ case H5D_CONTIGUOUS:
+ fprintf (out, "H5D_CONTIGUOUS");
+ break;
+ case H5D_CHUNKED:
+ fprintf (out, "H5D_CHUNKED");
+ break;
+ case H5D_NLAYOUTS:
+ fprintf (out, "H5D_NLAYOUTS");
+ break;
+ default:
+ fprintf (out, "%ld", (long)layout);
+ break;
+ }
+ }
+ break;
+
+ case 's':
+ if (ptr) {
+ if (vp) {
+ fprintf (out, "0x%lx", (unsigned long)vp);
+ } else {
+ fprintf(out, "NULL");
+ }
+ } else {
+ H5D_space_status_t space_status = va_arg(ap, H5D_space_status_t); /*lint !e64 Type mismatch not really occuring */
+ switch (space_status) {
+ case H5D_SPACE_STATUS_NOT_ALLOCATED:
+ fprintf (out, "H5D_SPACE_STATUS_NOT_ALLOCATED");
+ break;
+ case H5D_SPACE_STATUS_PART_ALLOCATED:
+ fprintf (out, "H5D_SPACE_STATUS_PART_ALLOCATED");
+ break;
+ case H5D_SPACE_STATUS_ALLOCATED:
+ fprintf (out, "H5D_SPACE_STATUS_ALLOCATED");
+ break;
+ case H5D_SPACE_STATUS_ERROR:
+ fprintf (out, "H5D_SPACE_STATUS_ERROR");
+ break;
+ default:
+ fprintf (out, "%ld", (long)space_status);
+ break;
+ }
+ }
+ break;
+
+ case 't':
+ if (ptr) {
+ if (vp) {
+ fprintf (out, "0x%lx", (unsigned long)vp);
+ } else {
+ fprintf(out, "NULL");
+ }
+ } else {
+ H5FD_mpio_xfer_t transfer = va_arg(ap, H5FD_mpio_xfer_t); /*lint !e64 Type mismatch not really occuring */
+ switch (transfer) {
+ case H5FD_MPIO_INDEPENDENT:
+ fprintf (out, "H5FD_MPIO_INDEPENDENT");
+ break;
+ case H5FD_MPIO_COLLECTIVE:
+ fprintf (out, "H5FD_MPIO_COLLECTIVE");
+ break;
+ default:
+ fprintf (out, "%ld", (long)transfer);
+ break;
+ }
+ }
+ break;
+
+ default:
+ fprintf (out, "BADTYPE(D%c)", type[1]);
+ goto error;
+ } /* end switch */
break;
case 'e':