summaryrefslogtreecommitdiffstats
path: root/src/H5Cdbg.c
diff options
context:
space:
mode:
authorDavid Young <dyoung@hdfgroup.org>2020-01-29 16:47:30 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2020-05-20 14:31:53 (GMT)
commit2badc1bf325cd6b9ff4962ce7b0e0296568f240e (patch)
tree278b22b2545d558f84c1c4d7dbce20404bdb1881 /src/H5Cdbg.c
parent2360f6e64417b95c00ee683b5e7edd45966d9663 (diff)
downloadhdf5-2badc1bf325cd6b9ff4962ce7b0e0296568f240e.zip
hdf5-2badc1bf325cd6b9ff4962ce7b0e0296568f240e.tar.gz
hdf5-2badc1bf325cd6b9ff4962ce7b0e0296568f240e.tar.bz2
Reduce casts of HDcalloc()/HDmalloc() that -Wc++-compat required.
Reduce gratuitous casts---e.g., (size_t)1. Use the right format string for a pointer. In the H5C sanity checks, change a "size increase" variable from ssize_t (too narrow) to int64_t (wide enough). Parenthesize every appearance of `storage` in the macro `H5D_CHUNK_STORAGE_INDEX_CHK(storage)` so that you can pass in an expression like &sc and it works properly. Disallow re-assignment of the `dset` parameter to H5D__chunk_init() because it helped assure me that it's safe to replace the repeating expression `&dset->shared->layout.storage.u.chunk` with `sc` throughout. Replace lengthy expressions such as `&dset->shared->layout.storage.u.chunk` with `sc` throughout several functions in H5Dchunk.c ISTR that the compiler warned that `sc` was declared but unused in a couple of functions, and then I found that `sc` could be used in many places. Maybe the disused `sc` appeared because a bunch of code was copied and pasted, I don't know. Anyway, it's a lot tighter code now that I use `sc`. In H5D__chunk_update_old_edge_chunks() and H5D__chunk_delete() I actually expand `sc` and another temporary variable, `pline`, because they're used only in !defined(NDEBUG) code. This squashes unused-variable warnings in the defined(NDEBUG) configuration. Don't drop the `volatile` qualification with a cast in tools/src/h5import/h5import.c.
Diffstat (limited to 'src/H5Cdbg.c')
-rw-r--r--src/H5Cdbg.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5Cdbg.c b/src/H5Cdbg.c
index 8b84cd6..8e65024 100644
--- a/src/H5Cdbg.c
+++ b/src/H5Cdbg.c
@@ -319,9 +319,8 @@ H5C_dump_cache_skip_list(H5C_t * cache_ptr, char * calling_fcn)
(int)(entry_ptr->is_dirty),
entry_ptr->type->name);
- HDfprintf(stdout, " node_ptr = 0x%llx, item = %p\n",
- (unsigned long long)node_ptr,
- H5SL_item(node_ptr));
+ HDfprintf(stdout, " node_ptr = %p, item = %p\n",
+ node_ptr, H5SL_item(node_ptr));
/* increment node_ptr before we delete its target */
node_ptr = H5SL_next(node_ptr);