summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/H5ACprivate.h20
-rw-r--r--src/H5C.c89
-rw-r--r--src/H5Cprivate.h224
-rw-r--r--src/H5FDfamily.c44
-rw-r--r--src/H5FDmulti.c113
-rw-r--r--src/H5Tconv.c244
-rw-r--r--src/H5Tnative.c24
-rw-r--r--src/H5VMprivate.h12
8 files changed, 384 insertions, 386 deletions
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index f59afd4..dffb5cb 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -29,11 +29,11 @@
#include "H5ACpublic.h" /*public prototypes */
/* Pivate headers needed by this header */
-#include "H5private.h" /* Generic Functions */
+#include "H5private.h" /* Generic Functions */
#include "H5Cprivate.h" /* Cache */
#include "H5Fprivate.h" /* File access */
#include "H5Pprivate.h" /* Property lists */
-#include "H5SLprivate.h" /* Skip lists */
+#include "H5SLprivate.h" /* Skip lists */
/* Global metadata tag values */
#define H5AC__INVALID_TAG (haddr_t)0
@@ -75,7 +75,7 @@ typedef enum {
H5AC_DRVRINFO_ID, /* (26) driver info block (supplements superblock) */
H5AC_EPOCH_MARKER_ID, /* (27) epoch marker - always internal to cache */
H5AC_PROXY_ENTRY_ID, /* (28) cache entry proxy */
- H5AC_PREFETCHED_ENTRY_ID, /* (29) prefetched entry - always internal to cache */
+ H5AC_PREFETCHED_ENTRY_ID, /* (29) prefetched entry - always internal to cache */
H5AC_NTYPES /* Number of types, must be last */
} H5AC_type_t;
@@ -90,8 +90,8 @@ typedef enum {
*
* NOTE: test/cache plays games with the f->shared->cache, and thus
* setting H5AC_DUMP_STATS_ON_CLOSE will generate constant,
- * irrelevant data when run with that test program. See
- * comments on setup_cache() / takedown_cache() in test/cache_common.c.
+ * irrelevant data when run with that test program. See
+ * comments on setup_cache() / takedown_cache() in test/cache_common.c.
* for details.
*
* If you need to dump stats at file close in test/cache.c,
@@ -132,7 +132,7 @@ typedef enum {
#endif
/*
- * Class methods pertaining to caching. Each type of cached object will
+ * Class methods pertaining to caching. Each type of cached object will
* have a constant variable with permanent life-span that describes how
* to cache the object.
*/
@@ -256,8 +256,8 @@ typedef struct H5AC_proxy_entry_t {
/* int epochs_before_eviction = */ 3, \
/* hbool_t apply_empty_reserve = */ TRUE, \
/* double empty_reserve = */ 0.1f, \
- /* size_t dirty_bytes_threshold = */ (256 * 1024), \
- /* int metadata_write_strategy = */ \
+ /* size_t dirty_bytes_threshold = */ (256 * 1024), \
+ /* int metadata_write_strategy = */ \
H5AC__DEFAULT_METADATA_WRITE_STRATEGY \
}
#else /* H5_HAVE_PARALLEL */
@@ -292,8 +292,8 @@ typedef struct H5AC_proxy_entry_t {
/* int epochs_before_eviction = */ 3, \
/* hbool_t apply_empty_reserve = */ TRUE, \
/* double empty_reserve = */ 0.1f, \
- /* size_t dirty_bytes_threshold = */ (256 * 1024), \
- /* int metadata_write_strategy = */ \
+ /* size_t dirty_bytes_threshold = */ (256 * 1024), \
+ /* int metadata_write_strategy = */ \
H5AC__DEFAULT_METADATA_WRITE_STRATEGY \
}
#endif /* H5_HAVE_PARALLEL */
diff --git a/src/H5C.c b/src/H5C.c
index 67bc629..fce8b26 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -79,16 +79,16 @@
/***********/
/* Headers */
/***********/
-#include "H5private.h" /* Generic Functions */
-#include "H5Cpkg.h" /* Cache */
-#include "H5CXprivate.h" /* API Contexts */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5Fpkg.h" /* Files */
-#include "H5FLprivate.h" /* Free Lists */
-#include "H5Iprivate.h" /* IDs */
-#include "H5MFprivate.h" /* File memory management */
-#include "H5MMprivate.h" /* Memory management */
-#include "H5Pprivate.h" /* Property lists */
+#include "H5private.h" /* Generic Functions */
+#include "H5Cpkg.h" /* Cache */
+#include "H5CXprivate.h" /* API Contexts */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5Fpkg.h" /* Files */
+#include "H5FLprivate.h" /* Free Lists */
+#include "H5Iprivate.h" /* IDs */
+#include "H5MFprivate.h" /* File memory management */
+#include "H5MMprivate.h" /* Memory management */
+#include "H5Pprivate.h" /* Property lists */
/****************/
@@ -1065,8 +1065,7 @@ H5C_evict(H5F_t * f)
HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL,
"unable to evict entries in the cache")
- /* Disable the slist,
- */
+ /* Disable the slist */
if ( H5C_set_slist_enabled(f->shared->cache, FALSE, TRUE) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "set slist disabled failed")
@@ -1080,8 +1079,8 @@ done:
* Function: H5C_expunge_entry
*
* Purpose: Use this function to tell the cache to expunge an entry
- * from the cache without writing it to disk even if it is
- * dirty. The entry may not be either pinned or protected.
+ * from the cache without writing it to disk even if it is
+ * dirty. The entry may not be either pinned or protected.
*
* Return: Non-negative on success/Negative on failure
*
@@ -1863,7 +1862,7 @@ done:
* Function: H5C_mark_entry_unserialized
*
* Purpose: Mark a pinned or protected entry as unserialized. The target
- * entry MUST be either pinned or protected, and MAY be both.
+ * entry MUST be either pinned or protected, and MAY be both.
*
* Return: Non-negative on success/Negative on failure
*
@@ -1908,7 +1907,7 @@ done:
* Function: H5C_mark_entry_serialized
*
* Purpose: Mark a pinned entry as serialized. The target entry MUST be
- * pinned.
+ * pinned.
*
* Return: Non-negative on success/Negative on failure
*
@@ -2252,7 +2251,7 @@ done:
* Function: H5C_pin_protected_entry()
*
* Purpose: Pin a protected cache entry. The entry must be protected
- * at the time of call, and must be unpinned.
+ * at the time of call, and must be unpinned.
*
* Return: Non-negative on success/Negative on failure
*
@@ -2607,7 +2606,7 @@ H5C_protect(H5F_t * f,
* *******************************************
*
* Set the flush_last field
- * of the newly loaded entry before inserting it into the
+ * of the newly loaded entry before inserting it into the
* index. Must do this, as the index tracked the number of
* entries with the flush_last field set, but assumes that
* the field will not change after insertion into the index.
@@ -2701,10 +2700,10 @@ H5C_protect(H5F_t * f,
/* check to see if the cache is now oversized due to the cache
* size reduction. If it is, try to evict enough entries to
* bring the cache size down to the current maximum cache size.
- *
- * Also, if the min_clean_size requirement is not met, we
- * should also call H5C__make_space_in_cache() to bring us
- * into complience.
+ *
+ * Also, if the min_clean_size requirement is not met, we
+ * should also call H5C__make_space_in_cache() to bring us
+ * into complience.
*/
if(cache_ptr->index_size >= cache_ptr->max_cache_size)
@@ -3213,7 +3212,7 @@ done:
* Function: H5C_unpin_entry()
*
* Purpose: Unpin a cache entry. The entry can be either protected or
- * unprotected at the time of call, but must be pinned.
+ * unprotected at the time of call, but must be pinned.
*
* Return: Non-negative on success/Negative on failure
*
@@ -3870,7 +3869,7 @@ done:
* Function: H5C_validate_resize_config()
*
* Purpose: Run a sanity check on the specified sections of the
- * provided instance of struct H5C_auto_size_ctl_t.
+ * provided instance of struct H5C_auto_size_ctl_t.
*
* Do nothing and return SUCCEED if no errors are detected,
* and flag an error and return FAIL otherwise.
@@ -4029,11 +4028,11 @@ done:
/*-------------------------------------------------------------------------
* Function: H5C_create_flush_dependency()
*
- * Purpose: Initiates a parent<->child entry flush dependency. The parent
+ * Purpose: Initiates a parent<->child entry flush dependency. The parent
* entry must be pinned or protected at the time of call, and must
* have all dependencies removed before the cache can shut down.
*
- * Note: Flush dependencies in the cache indicate that a child entry
+ * Note: Flush dependencies in the cache indicate that a child entry
* must be flushed to the file before its parent. (This is
* currently used to implement Single-Writer/Multiple-Reader (SWMR)
* I/O access for data structures in the file).
@@ -4173,7 +4172,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5C_destroy_flush_dependency()
*
- * Purpose: Terminates a parent<-> child entry flush dependency. The
+ * Purpose: Terminates a parent<-> child entry flush dependency. The
* parent entry must be pinned.
*
* Return: Non-negative on success/Negative on failure
@@ -4295,7 +4294,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5C__pin_entry_from_client()
*
- * Purpose: Internal routine to pin a cache entry from a client action.
+ * Purpose: Internal routine to pin a cache entry from a client action.
*
* Return: Non-negative on success/Negative on failure
*
@@ -4344,7 +4343,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5C__unpin_entry_real()
*
- * Purpose: Internal routine to unpin a cache entry.
+ * Purpose: Internal routine to unpin a cache entry.
*
* Return: Non-negative on success/Negative on failure
*
@@ -4390,7 +4389,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5C__unpin_entry_from_client()
*
- * Purpose: Internal routine to unpin a cache entry from a client action.
+ * Purpose: Internal routine to unpin a cache entry from a client action.
*
* Return: Non-negative on success/Negative on failure
*
@@ -4684,7 +4683,7 @@ H5C__auto_adjust_cache_size(H5F_t *f, hbool_t write_permitted)
*
* ( 0 <= new_min_clean_size ).
*
- * by definition.
+ * by definition.
*/
HDassert( new_min_clean_size <= new_max_cache_size );
HDassert( (cache_ptr->resize_ctl).min_size <= new_max_cache_size );
@@ -4951,8 +4950,8 @@ done:
*
* Purpose: Evict clean entries in the cache that haven't
* been accessed for at least
- * (cache_ptr->resize_ctl).epochs_before_eviction epochs,
- * and flush dirty entries that haven't been accessed for
+ * (cache_ptr->resize_ctl).epochs_before_eviction epochs,
+ * and flush dirty entries that haven't been accessed for
* that amount of time.
*
* Depending on configuration, the function will either
@@ -5087,7 +5086,7 @@ H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *f, hbool_t write_permitte
|| (prev_ptr->is_protected)
|| (prev_ptr->is_pinned)) {
/* Something has happened to the LRU -- start over
- * from the tail.
+ * from the tail.
*/
restart_scan = FALSE;
entry_ptr = cache_ptr->LRU_tail_ptr;
@@ -5146,10 +5145,10 @@ H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *f, hbool_t write_permitte
/* just skip the entry if it is dirty, as we can't do
* anything with it now since we can't write.
- *
- * Since all entries are clean, serialize() will not be called,
- * and thus we needn't test to see if the LRU has been changed
- * out from under us.
+ *
+ * Since all entries are clean, serialize() will not be called,
+ * and thus we needn't test to see if the LRU has been changed
+ * out from under us.
*/
entry_ptr = prev_ptr;
} /* end while */
@@ -5239,7 +5238,7 @@ done:
* Function: H5C__autoadjust__ageout__remove_all_markers
*
* Purpose: Remove all epoch markers from the LRU list and mark them
- * as inactive.
+ * as inactive.
*
* Return: SUCCEED on success/FAIL on failure.
*
@@ -5504,9 +5503,9 @@ H5C__flash_increase_cache_size(H5C_t * cache_ptr,
}
/* note that we don't cycle the epoch markers. We can
- * argue either way as to whether we should, but for now
- * we don't.
- */
+ * argue either way as to whether we should, but for now
+ * we don't.
+ */
if ( (cache_ptr->resize_ctl).rpt_fcn != NULL ) {
@@ -7914,7 +7913,7 @@ H5C__make_space_in_cache(H5F_t *f, size_t space_needed, hbool_t write_permitt
}
#endif /* H5C_COLLECT_CACHE_STATS */
- /* reset entries_removed_counter and
+ /* reset entries_removed_counter and
* last_entry_removed_ptr prior to the call to
* H5C__flush_single_entry() so that we can spot
* unexpected removals of entries from the cache,
@@ -7974,12 +7973,12 @@ H5C__make_space_in_cache(H5F_t *f, size_t space_needed, hbool_t write_permitt
if ( didnt_flush_entry ) {
- /* epoch markers don't get flushed, and we don't touch
+ /* epoch markers don't get flushed, and we don't touch
* entries that are in the process of being flushed.
* Hence no need for sanity checks, as we haven't
* flushed anything. Thus just set entry_ptr to prev_ptr
* and go on.
- */
+ */
entry_ptr = prev_ptr;
} else if ( ( restart_scan )
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
index 8286516..6909a4d 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -143,47 +143,47 @@
*
*
* These flags apply to H5C_insert_entry():
- * H5C__SET_FLUSH_MARKER_FLAG
- * H5C__PIN_ENTRY_FLAG
+ * H5C__SET_FLUSH_MARKER_FLAG
+ * H5C__PIN_ENTRY_FLAG
* H5C__FLUSH_LAST_FLAG ; super block only
* H5C__FLUSH_COLLECTIVELY_FLAG ; super block only
*
* These flags apply to H5C_protect()
- * H5C__READ_ONLY_FLAG
+ * H5C__READ_ONLY_FLAG
* H5C__FLUSH_LAST_FLAG ; super block only
* H5C__FLUSH_COLLECTIVELY_FLAG ; super block only
*
* These flags apply to H5C_unprotect():
- * H5C__SET_FLUSH_MARKER_FLAG
- * H5C__DELETED_FLAG
- * H5C__DIRTIED_FLAG
- * H5C__PIN_ENTRY_FLAG
- * H5C__UNPIN_ENTRY_FLAG
- * H5C__FREE_FILE_SPACE_FLAG
- * H5C__TAKE_OWNERSHIP_FLAG
+ * H5C__SET_FLUSH_MARKER_FLAG
+ * H5C__DELETED_FLAG
+ * H5C__DIRTIED_FLAG
+ * H5C__PIN_ENTRY_FLAG
+ * H5C__UNPIN_ENTRY_FLAG
+ * H5C__FREE_FILE_SPACE_FLAG
+ * H5C__TAKE_OWNERSHIP_FLAG
*
* These flags apply to H5C_expunge_entry():
- * H5C__FREE_FILE_SPACE_FLAG
+ * H5C__FREE_FILE_SPACE_FLAG
*
* These flags apply to H5C_evict():
- * H5C__EVICT_ALLOW_LAST_PINS_FLAG
+ * H5C__EVICT_ALLOW_LAST_PINS_FLAG
*
* These flags apply to H5C_flush_cache():
- * H5C__FLUSH_INVALIDATE_FLAG
- * H5C__FLUSH_CLEAR_ONLY_FLAG
- * H5C__FLUSH_MARKED_ENTRIES_FLAG
+ * H5C__FLUSH_INVALIDATE_FLAG
+ * H5C__FLUSH_CLEAR_ONLY_FLAG
+ * H5C__FLUSH_MARKED_ENTRIES_FLAG
* H5C__FLUSH_IGNORE_PROTECTED_FLAG (can't use this flag in combination
* with H5C__FLUSH_INVALIDATE_FLAG)
- * H5C__DURING_FLUSH_FLAG
+ * H5C__DURING_FLUSH_FLAG
*
* These flags apply to H5C_flush_single_entry():
- * H5C__FLUSH_INVALIDATE_FLAG
- * H5C__FLUSH_CLEAR_ONLY_FLAG
- * H5C__FLUSH_MARKED_ENTRIES_FLAG
- * H5C__TAKE_OWNERSHIP_FLAG
- * H5C__DEL_FROM_SLIST_ON_DESTROY_FLAG
- * H5C__GENERATE_IMAGE_FLAG
- * H5C__UPDATE_PAGE_BUFFER_FLAG
+ * H5C__FLUSH_INVALIDATE_FLAG
+ * H5C__FLUSH_CLEAR_ONLY_FLAG
+ * H5C__FLUSH_MARKED_ENTRIES_FLAG
+ * H5C__TAKE_OWNERSHIP_FLAG
+ * H5C__DEL_FROM_SLIST_ON_DESTROY_FLAG
+ * H5C__GENERATE_IMAGE_FLAG
+ * H5C__UPDATE_PAGE_BUFFER_FLAG
*/
#define H5C__NO_FLAGS_SET 0x00000
#define H5C__SET_FLUSH_MARKER_FLAG 0x00001
@@ -333,11 +333,11 @@ typedef struct H5C_t H5C_t;
* returned in the parameter "image_len_ptr".
*
* For an entry with H5C__CLASS_NO_FLAGS_SET:
- * This function returns in "image_len_ptr" the on disk size of the
+ * This function returns in "image_len_ptr" the on disk size of the
* entry.
*
* For an entry with H5C__CLASS_SPECULATIVE_LOAD_FLAG:
- * This function returns in "image_len_ptr" an initial guess of the
+ * This function returns in "image_len_ptr" an initial guess of the
* entry's on disk size. This many bytes will be loaded from
* the file and then passed to 'get_final_load_size' callback
* for the actual (final) image length to be determined.
@@ -372,7 +372,7 @@ typedef struct H5C_t H5C_t;
*
* GET_FINAL_LOAD_SIZE: Pointer to the 'get final load size' function.
*
- * This function determines the final size of a speculatively loaded
+ * This function determines the final size of a speculatively loaded
* metadata cache entry based on the parameter "image" and the "udata"
* parameters. This callback _must_ be implemented for cache clients
* which set the H5C__CLASS_SPECULATIVE_LOAD_FLAG and must return the
@@ -421,7 +421,7 @@ typedef struct H5C_t H5C_t;
*
* It computes the checksum based on the metadata stored in the
* parameter "image_ptr" and the actual length of the metadata in the
- * parameter "len" which is obtained from the "get_load_size" callback.
+ * parameter "len" which is obtained from the "get_load_size" callback.
*
* The typedef for the verify_chksum callback is as follows:
*
@@ -440,7 +440,7 @@ typedef struct H5C_t H5C_t;
*
* DESERIALIZE: Pointer to the deserialize function.
*
- * This function must be able to deserialize a buffer containing the
+ * This function must be able to deserialize a buffer containing the
* on-disk image of a metadata cache entry, allocate and initialize the
* equivalent in core representation, and return a pointer to that
* representation.
@@ -509,7 +509,7 @@ typedef struct H5C_t H5C_t;
* typedef herr_t (*H5C_image_len_func_t)(void *thing,
* size_t *image_len_ptr);
*
- * The parameters of the image_len callback are as follows:
+ * The parameters of the image_len callback are as follows:
*
* thing: Pointer to the in core representation of the entry.
*
@@ -533,11 +533,11 @@ typedef struct H5C_t H5C_t;
* it needs a current on-disk image of the metadata entry for purposes
* either constructing a journal or flushing the entry to disk.
*
- * If the client needs to change the address or length of the entry prior
- * to flush, the pre-serialize callback is responsible for these actions,
- * so that the actual serialize callback (described below) is only
- * responsible for serializing the data structure, not moving it on disk
- * or resizing it.
+ * If the client needs to change the address or length of the entry prior
+ * to flush, the pre-serialize callback is responsible for these actions,
+ * so that the actual serialize callback (described below) is only
+ * responsible for serializing the data structure, not moving it on disk
+ * or resizing it.
*
* In addition, the client may use the pre-serialize callback to
* ensure that the entry is ready to be flushed -- in particular,
@@ -850,11 +850,11 @@ typedef enum H5C_notify_action_t {
H5C_NOTIFY_ACTION_AFTER_INSERT, /* Entry has been added to the cache
* via the insert call
*/
- H5C_NOTIFY_ACTION_AFTER_LOAD, /* Entry has been loaded into the
+ H5C_NOTIFY_ACTION_AFTER_LOAD, /* Entry has been loaded into the
* from file via the protect call
*/
- H5C_NOTIFY_ACTION_AFTER_FLUSH, /* Entry has just been flushed to
- * file.
+ H5C_NOTIFY_ACTION_AFTER_FLUSH, /* Entry has just been flushed to
+ * file.
*/
H5C_NOTIFY_ACTION_BEFORE_EVICT, /* Entry is about to be evicted
* from cache.
@@ -1016,8 +1016,8 @@ typedef int H5C_ring_t;
* on disk image of the metadata cache entry is stored.
*
* If the entry is dirty, the pre-serialize and serialize
- * callbacks must be used to update this image before it is
- * written to disk
+ * callbacks must be used to update this image before it is
+ * written to disk
*
* image_up_to_date: Boolean flag that is set to TRUE when *image_ptr
* is up to date, and set to false when the entry is dirtied.
@@ -1039,23 +1039,23 @@ typedef int H5C_ring_t;
*
* This field is set to FALSE in the protect call, and may
* be set to TRUE by the H5C_mark_entry_dirty() call at any
- * time prior to the unprotect call.
+ * time prior to the unprotect call.
*
* The H5C_mark_entry_dirty() call exists as a convenience
- * function for the fractal heap code which may not know if
- * an entry is protected or pinned, but knows that is either
- * protected or pinned. The dirtied field was added as in
- * the parallel case, it is necessary to know whether a
- * protected entry is dirty prior to the protect call.
+ * function for the fractal heap code which may not know if
+ * an entry is protected or pinned, but knows that is either
+ * protected or pinned. The dirtied field was added as in
+ * the parallel case, it is necessary to know whether a
+ * protected entry is dirty prior to the protect call.
*
* is_protected: Boolean flag indicating whether this entry is protected
- * (or locked, to use more conventional terms). When it is
- * protected, the entry cannot be flushed or accessed until
- * it is unprotected (or unlocked -- again to use more
- * conventional terms).
+ * (or locked, to use more conventional terms). When it is
+ * protected, the entry cannot be flushed or accessed until
+ * it is unprotected (or unlocked -- again to use more
+ * conventional terms).
*
- * Note that protected entries are removed from the LRU lists
- * and inserted on the protected list.
+ * Note that protected entries are removed from the LRU lists
+ * and inserted on the protected list.
*
* is_read_only: Boolean flag that is only meaningful if is_protected is
* TRUE. In this circumstance, it indicates whether the
@@ -1065,10 +1065,10 @@ typedef int H5C_ring_t;
* and is_read_only are both TRUE), we allow the entry to be
* protected more than once.
*
- * In this case, the number of readers is maintained in the
- * ro_ref_count field (see below), and unprotect calls simply
- * decrement that field until it drops to zero, at which point
- * the entry is actually unprotected.
+ * In this case, the number of readers is maintained in the
+ * ro_ref_count field (see below), and unprotect calls simply
+ * decrement that field until it drops to zero, at which point
+ * the entry is actually unprotected.
*
* ro_ref_count: Integer field used to maintain a count of the number of
* outstanding read-only protects on this entry. This field
@@ -1091,12 +1091,12 @@ typedef int H5C_ring_t;
*
* 2) A pinned entry can be accessed or modified at any time.
* This places an extra burden on the pre-serialize and
- * serialize callbacks, which must ensure that a pinned
- * entry is consistent and ready to write to disk before
- * generating an image.
+ * serialize callbacks, which must ensure that a pinned
+ * entry is consistent and ready to write to disk before
+ * generating an image.
*
* 3) A pinned entry can be marked as dirty (and possibly
- * change size) while it is unprotected.
+ * change size) while it is unprotected.
*
* 4) The flush-destroy code must allow pinned entries to
* be unpinned (and possibly unprotected) during the
@@ -1158,11 +1158,11 @@ typedef int H5C_ring_t;
* other times, this field should be set to FALSE.
*
* flush_in_progress: Boolean flag that is set to true iff the entry
- * is in the process of being flushed. This allows the cache
- * to detect when a call is the result of a flush callback.
+ * is in the process of being flushed. This allows the cache
+ * to detect when a call is the result of a flush callback.
*
* destroy_in_progress: Boolean flag that is set to true iff the entry
- * is in the process of being flushed and destroyed.
+ * is in the process of being flushed and destroyed.
*
*
* Fields supporting rings for flush ordering:
@@ -1581,17 +1581,17 @@ typedef int H5C_ring_t;
* and H5C_COLLECT_CACHE_ENTRY_STATS are true. When present, they allow
* collection of statistics on individual cache entries.
*
- * accesses: int32_t containing the number of times this cache entry has
- * been referenced in its lifetime.
+ * accesses: int32_t containing the number of times this cache entry has
+ * been referenced in its lifetime.
*
* clears: int32_t containing the number of times this cache entry has
- * been cleared in its life time.
+ * been cleared in its life time.
*
- * flushes: int32_t containing the number of times this cache entry has
- * been flushed to file in its life time.
+ * flushes: int32_t containing the number of times this cache entry has
+ * been flushed to file in its life time.
*
- * pins: int32_t containing the number of times this cache entry has
- * been pinned in cache in its life time.
+ * pins: int32_t containing the number of times this cache entry has
+ * been pinned in cache in its life time.
*
****************************************************************************/
typedef struct H5C_cache_entry_t {
@@ -1708,7 +1708,7 @@ typedef struct H5C_cache_entry_t {
* ring: Instance of H5C_ring_t indicating the flush ordering ring
* to which this entry is assigned.
*
- * age: Number of times this prefetech entry has appeared in
+ * age: Number of times this prefetech entry has appeared in
* the current sequence of cache images. This field is
* initialized to 0 if the instance of H5C_image_entry_t
* is constructed from a regular entry.
@@ -1758,17 +1758,17 @@ typedef struct H5C_cache_entry_t {
*
* Note that while this count is initially taken from the
* flush dependency fields in the associated instance of
- * H5C_cache_entry_t, if the entry is in the cache image
- * (i.e. include_in_image is TRUE), any parents that are
- * not in the image are removed from this count and
+ * H5C_cache_entry_t, if the entry is in the cache image
+ * (i.e. include_in_image is TRUE), any parents that are
+ * not in the image are removed from this count and
* from the fd_parent_addrs array below.
*
* Finally observe that if the entry is dirty and in the
* cache image, and its parent is dirty and not in the cache
* image, then the entry must be removed from the cache image
* to avoid violating the flush dependency flush ordering.
- * This should have happened before the construction of
- * the instance of H5C_image_entry_t.
+ * This should have happened before the construction of
+ * the instance of H5C_image_entry_t.
*
* fd_parent_addrs: If the entry is a child in one or more flush dependency
* relationship when H5C_prep_for_file_close() is called, this
@@ -1781,27 +1781,27 @@ typedef struct H5C_cache_entry_t {
* Note that while this list of addresses is initially taken
* from the flush dependency fields in the associated instance of
* H5C_cache_entry_t, if the entry is in the cache image
- * (i.e. include_in_image is TRUE), any parents that are not
- * in the image are removed from this list, and from the
- * fd_parent_count above.
+ * (i.e. include_in_image is TRUE), any parents that are not
+ * in the image are removed from this list, and from the
+ * fd_parent_count above.
*
* Finally observe that if the entry is dirty and in the
* cache image, and its parent is dirty and not in the cache
* image, then the entry must be removed from the cache image
* to avoid violating the flush dependency flush ordering.
- * This should have happened before the construction of
- * the instance of H5C_image_entry_t.
+ * This should have happened before the construction of
+ * the instance of H5C_image_entry_t.
*
* fd_child_count: If the entry is a parent in a flush dependency
- * relationship, this field contains the number of flush
- * dependency children.
+ * relationship, this field contains the number of flush
+ * dependency children.
*
- * In all other cases, the field is set to zero.
+ * In all other cases, the field is set to zero.
*
* Note that while this count is initially taken from the
* flush dependency fields in the associated instance of
* H5C_cache_entry_t, if the entry is in the cache image
- * (i.e. include_in_image is TRUE), any children
+ * (i.e. include_in_image is TRUE), any children
* that are not in the image are removed from this count.
*
* fd_dirty_child_count: If the entry is a parent in a flush dependency
@@ -1813,16 +1813,16 @@ typedef struct H5C_cache_entry_t {
* Note that while this count is initially taken from the
* flush dependency fields in the associated instance of
* H5C_cache_entry_t, if the entry is in the cache image
- * (i.e. include_in_image is TRUE), any dirty children
- * that are not in the image are removed from this count.
+ * (i.e. include_in_image is TRUE), any dirty children
+ * that are not in the image are removed from this count.
*
* image_ptr: Pointer to void. When not NULL, this field points to a
- * dynamically allocated block of size bytes in which the
- * on disk image of the metadata cache entry is stored.
+ * dynamically allocated block of size bytes in which the
+ * on disk image of the metadata cache entry is stored.
*
- * If the entry is dirty, the pre-serialize and serialize
- * callbacks must be used to update this image before it is
- * written to disk
+ * If the entry is dirty, the pre-serialize and serialize
+ * callbacks must be used to update this image before it is
+ * written to disk
*
*
****************************************************************************/
@@ -1859,7 +1859,7 @@ typedef struct H5C_image_entry_t {
* version number, or an error will be flagged.
*
* report_fcn: Pointer to the function that is to be called to report
- * activities each time the auto cache resize code is executed. If the
+ * activities each time the auto cache resize code is executed. If the
* field is NULL, no call is made.
*
* If the field is not NULL, it must contain the address of a function
@@ -1884,16 +1884,16 @@ typedef struct H5C_image_entry_t {
* be greater than or equal to min_size.
*
* min_size: Minimum size to which the cache can be adjusted. The
- * supplied value must fall in the closed interval
- * [MIN_MAX_CACHE_SIZE, MAX_MAX_CACHE_SIZE]. Also, min_size must
+ * supplied value must fall in the closed interval
+ * [MIN_MAX_CACHE_SIZE, MAX_MAX_CACHE_SIZE]. Also, min_size must
* be less than or equal to max_size.
*
* epoch_length: Number of accesses on the cache over which to collect
* hit rate stats before running the automatic cache resize code,
- * if it is enabled.
+ * if it is enabled.
*
* At the end of an epoch, we discard prior hit rate data and start
- * collecting afresh. The epoch_length must lie in the closed
+ * collecting afresh. The epoch_length must lie in the closed
* interval [H5C__MIN_AR_EPOCH_LENGTH, H5C__MAX_AR_EPOCH_LENGTH].
*
*
@@ -1919,30 +1919,30 @@ typedef struct H5C_image_entry_t {
* all available space.
*
* lower_hr_threshold: Lower hit rate threshold. If the increment mode
- * (incr_mode) is H5C_incr__threshold and the hit rate drops below the
- * value supplied in this field in an epoch, increment the cache size by
- * size_increment. Note that cache size may not be incremented above
- * max_size, and that the increment may be further restricted by the
- * max_increment field if it is enabled.
+ * (incr_mode) is H5C_incr__threshold and the hit rate drops below the
+ * value supplied in this field in an epoch, increment the cache size by
+ * size_increment. Note that cache size may not be incremented above
+ * max_size, and that the increment may be further restricted by the
+ * max_increment field if it is enabled.
*
- * When enabled, this field must contain a value in the range [0.0, 1.0].
- * Depending on the incr_mode selected, it may also have to be less than
- * upper_hr_threshold.
+ * When enabled, this field must contain a value in the range [0.0, 1.0].
+ * Depending on the incr_mode selected, it may also have to be less than
+ * upper_hr_threshold.
*
* increment: Double containing the multiplier used to derive the new
- * cache size from the old if a cache size increment is triggered.
- * The increment must be greater than 1.0, and should not exceed 2.0.
+ * cache size from the old if a cache size increment is triggered.
+ * The increment must be greater than 1.0, and should not exceed 2.0.
*
- * The new cache size is obtained by multiplying the current max cache
- * size by the increment, and then clamping to max_size and to stay
- * within the max_increment as necessary.
+ * The new cache size is obtained by multiplying the current max cache
+ * size by the increment, and then clamping to max_size and to stay
+ * within the max_increment as necessary.
*
* apply_max_increment: Boolean flag indicating whether the max_increment
- * field should be used to limit the maximum cache size increment.
+ * field should be used to limit the maximum cache size increment.
*
* max_increment: If enabled by the apply_max_increment field described
- * above, this field contains the maximum number of bytes by which the
- * cache size can be increased in a single re-size.
+ * above, this field contains the maximum number of bytes by which the
+ * cache size can be increased in a single re-size.
*
* flash_incr_mode: Instance of the H5C_cache_flash_incr_mode enumerated
* type whose value indicates whether and by what algorithm we should
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c
index 01f87a2..811f564 100644
--- a/src/H5FDfamily.c
+++ b/src/H5FDfamily.c
@@ -237,7 +237,7 @@ H5FD__family_term(void)
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -280,11 +280,11 @@ done:
* Function: H5Pget_fapl_family
*
* Purpose: Returns information about the family file access property
- * list though the function arguments.
+ * list though the function arguments.
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -324,11 +324,11 @@ done:
* Function: H5FD__family_fapl_get
*
* Purpose: Gets a file access property list which could be used to
- * create an identical file.
+ * create an identical file.
*
* Return: Success: Ptr to new file access property list.
*
- * Failure: NULL
+ * Failure: NULL
*
* Programmer: Robb Matzke
* Friday, August 13, 1999
@@ -372,7 +372,7 @@ done:
*
* Return: Success: Ptr to a new property list
*
- * Failure: NULL
+ * Failure: NULL
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -425,7 +425,7 @@ done:
*
* Return: Success: 0
*
- * Failure: -1
+ * Failure: -1
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -457,7 +457,7 @@ done:
*
* Return: Success: The super block driver data size.
*
- * Failure: never fails
+ * Failure: never fails
*
* Programmer: Raymond Lu
* Tuesday, May 10, 2005
@@ -486,7 +486,7 @@ H5FD__family_sb_size(H5FD_t H5_ATTR_UNUSED *_file)
*
* Return: Success: 0
*
- * Failure: -1
+ * Failure: -1
*
* Programmer: Raymond Lu
* Tuesday, May 10, 2005
@@ -521,7 +521,7 @@ H5FD__family_sb_encode(H5FD_t *_file, char *name/*out*/, unsigned char *buf/*out
/*-------------------------------------------------------------------------
* Function: H5FD__family_sb_decode
*
- * Purpose: This function has 2 separate purpose. One is to decodes the
+ * Purpose: This function has 2 separate purpose. One is to decodes the
* superblock information for this driver. The NAME argument is
* the eight-character (plus null termination) name stored in i
* the file. The FILE argument is updated according to the
@@ -529,7 +529,7 @@ H5FD__family_sb_encode(H5FD_t *_file, char *name/*out*/, unsigned char *buf/*out
*
* Return: Success: 0
*
- * Failure: -1
+ * Failure: -1
*
* Programmer: Raymond Lu
* Tuesday, May 10, 2005
@@ -582,7 +582,7 @@ done:
* public fields will be initialized by the
* caller, which is always H5FD_open().
*
- * Failure: NULL
+ * Failure: NULL
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -756,7 +756,7 @@ H5_GCC_DIAG_ON("format-nonliteral")
*
* Return: Success: Non-negative
*
- * Failure: Negative with as many members closed as
+ * Failure: Negative with as many members closed as
* possible. The only subsequent operation
* permitted on the file is a close operation.
*
@@ -809,7 +809,7 @@ H5FD__family_close(H5FD_t *_file)
*
* Return: Success: like strcmp()
*
- * Failure: never fails (arguments were checked by the
+ * Failure: never fails (arguments were checked by the
* caller).
*
* Programmer: Robb Matzke
@@ -842,7 +842,7 @@ H5FD__family_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
* (listed in H5FDpublic.h)
*
* Return: Success: non-negative
- * Failure: negative
+ * Failure: negative
*
* Programmer: Quincey Koziol
* Friday, August 25, 2000
@@ -882,7 +882,7 @@ H5FD__family_query(const H5FD_t * _file, unsigned long *flags /* out */)
*
* Return: Success: The end-of-address-marker
*
- * Failure: HADDR_UNDEF
+ * Failure: HADDR_UNDEF
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -907,7 +907,7 @@ H5FD__family_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
*
* Return: Success: 0
*
- * Failure: -1
+ * Failure: -1
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -1000,7 +1000,7 @@ H5_GCC_DIAG_ON("format-nonliteral")
* the end of the family of files or the current
* EOA, whichever is larger.
*
- * Failure: HADDR_UNDEF
+ * Failure: HADDR_UNDEF
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -1096,7 +1096,7 @@ done:
* Return: Success: Zero. Result is stored in caller-supplied
* buffer BUF.
*
- * Failure: -1, contents of buffer BUF are undefined.
+ * Failure: -1, contents of buffer BUF are undefined.
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -1163,7 +1163,7 @@ done:
*
* Return: Success: Zero
*
- * Failure: -1
+ * Failure: -1
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -1227,7 +1227,7 @@ done:
* Purpose: Flushes all family members.
*
* Return: Success: 0
- * Failure: -1, as many files flushed as possible.
+ * Failure: -1, as many files flushed as possible.
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -1262,7 +1262,7 @@ done:
*
* Return: Success: 0
*
- * Failure: -1, as many files truncated as possible.
+ * Failure: -1, as many files truncated as possible.
*
* Programmer: Quincey Koziol
* Saturday, February 23, 2008
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index bb26451..d5f8702 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -43,10 +43,10 @@
\
memset(SEEN, 0, sizeof SEEN); \
for (ITER=H5FD_MEM_SUPER; ITER<H5FD_MEM_NTYPES; ITER=(H5FD_mem_t)(ITER+1)) { \
- LOOPVAR = MAP[ITER]; \
- if (H5FD_MEM_DEFAULT==LOOPVAR) LOOPVAR=ITER; \
- assert(LOOPVAR>0 && LOOPVAR<H5FD_MEM_NTYPES); \
- if (SEEN[LOOPVAR]++) continue; \
+ LOOPVAR = MAP[ITER]; \
+ if (H5FD_MEM_DEFAULT==LOOPVAR) LOOPVAR=ITER; \
+ assert(LOOPVAR>0 && LOOPVAR<H5FD_MEM_NTYPES); \
+ if (SEEN[LOOPVAR]++) continue; \
/* Need two front-ends, since they are nested sometimes */
#define UNIQUE_MEMBERS(MAP, LOOPVAR) \
@@ -72,7 +72,7 @@ typedef struct H5FD_multi_fapl_t {
hid_t memb_fapl[H5FD_MEM_NTYPES]; /*member access properties */
char *memb_name[H5FD_MEM_NTYPES]; /*name generators */
haddr_t memb_addr[H5FD_MEM_NTYPES]; /*starting addr per member */
- hbool_t relax; /*less stringent error checking */
+ hbool_t relax; /*less stringent error checking */
} H5FD_multi_fapl_t;
/*
@@ -181,7 +181,7 @@ static const H5FD_class_t H5FD_multi_g = {
*
* Return: Success: Ptr to new copy of string
*
- * Failure: NULL
+ * Failure: NULL
*
* Programmer: Robb Matzke
* Friday, August 13, 1999
@@ -235,7 +235,7 @@ H5FD_multi_init(void)
/*---------------------------------------------------------------------------
* Function: H5FD_multi_term
*
- * Purpose: Shut down the VFD
+ * Purpose: Shut down the VFD
*
* Returns: Non-negative on success or negative on failure
*
@@ -263,7 +263,7 @@ H5FD_multi_term(void)
*
* Return: Success: 0
*
- * Failure: -1
+ * Failure: -1
*
* Programmer: Robb Matzke
* Wednesday, August 11, 1999
@@ -371,7 +371,7 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id,
* memb_map: The default member map has the value
* H5FD_MEM_DEFAULT for each element.
*
- * memb_fapl: The value H5P_DEFAULT for each element.
+ * memb_fapl: The value H5P_DEFAULT for each element.
*
* memb_name: The string `%s-X.h5' where `X' is one of the
* letters `s' (H5FD_MEM_SUPER),
@@ -379,26 +379,26 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id,
* `g' (H5FD_MEM_GHEAP), 'l' (H5FD_MEM_LHEAP),
* `o' (H5FD_MEM_OHDR).
*
- * memb_addr: The value HADDR_UNDEF for each element.
+ * memb_addr: The value HADDR_UNDEF for each element.
*
*
* Example: To set up a multi file access property list which partitions
* data into meta and raw files each being 1/2 of the address
* space one would say:
*
- * H5FD_mem_t mt, memb_map[H5FD_MEM_NTYPES];
+ * H5FD_mem_t mt, memb_map[H5FD_MEM_NTYPES];
* hid_t memb_fapl[H5FD_MEM_NTYPES];
* const char *memb[H5FD_MEM_NTYPES];
* haddr_t memb_addr[H5FD_MEM_NTYPES];
*
- * // The mapping...
- * for (mt=0; mt<H5FD_MEM_NTYPES; mt++) {
+ * // The mapping...
+ * for (mt=0; mt<H5FD_MEM_NTYPES; mt++) {
* memb_map[mt] = H5FD_MEM_SUPER;
* }
- * memb_map[H5FD_MEM_DRAW] = H5FD_MEM_DRAW;
+ * memb_map[H5FD_MEM_DRAW] = H5FD_MEM_DRAW;
*
- * // Member information
- * memb_fapl[H5FD_MEM_SUPER] = H5P_DEFAULT;
+ * // Member information
+ * memb_fapl[H5FD_MEM_SUPER] = H5P_DEFAULT;
* memb_name[H5FD_MEM_SUPER] = "%s.meta";
* memb_addr[H5FD_MEM_SUPER] = 0;
*
@@ -406,14 +406,14 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id,
* memb_name[H5FD_MEM_DRAW] = "%s.raw";
* memb_addr[H5FD_MEM_DRAW] = HADDR_MAX/2;
*
- * hid_t fapl = H5Pcreate(H5P_FILE_ACCESS);
+ * hid_t fapl = H5Pcreate(H5P_FILE_ACCESS);
* H5Pset_fapl_multi(fapl, memb_map, memb_fapl,
* memb_name, memb_addr, TRUE);
*
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -516,7 +516,7 @@ H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -576,11 +576,11 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/,
* Function: H5FD_multi_sb_size
*
* Purpose: Returns the size of the private information to be stored in
- * the superblock.
+ * the superblock.
*
* Return: Success: The super block driver data size.
*
- * Failure: never fails
+ * Failure: never fails
*
* Programmer: Robb Matzke
* Monday, August 16, 1999
@@ -631,7 +631,7 @@ H5FD_multi_sb_size(H5FD_t *_file)
*
* Return: Success: 0
*
- * Failure: -1
+ * Failure: -1
*
* Programmer: Robb Matzke
* Monday, August 16, 1999
@@ -712,7 +712,7 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name/*out*/,
*
* Return: Success: 0
*
- * Failure: -1
+ * Failure: -1
*
* Programmer: Robb Matzke
* Monday, August 16, 1999
@@ -850,7 +850,7 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
* Return: Success: Ptr to new file access property list with all
* members copied from the file struct.
*
- * Failure: NULL
+ * Failure: NULL
*
* Programmer: Robb Matzke
* Friday, August 13, 1999
@@ -876,7 +876,7 @@ H5FD_multi_fapl_get(H5FD_t *_file)
*
* Return: Success: Ptr to a new property list
*
- * Failure: NULL
+ * Failure: NULL
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -935,7 +935,7 @@ H5FD_multi_fapl_copy(const void *_old_fa)
*
* Return: Success: 0
*
- * Failure: -1
+ * Failure: -1
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -973,7 +973,7 @@ H5FD_multi_fapl_free(void *_fa)
* public fields will be initialized by the
* caller, which is always H5FD_open().
*
- * Failure: NULL
+ * Failure: NULL
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -1068,7 +1068,7 @@ error:
*
* Return: Success: Non-negative
*
- * Failure: Negative with as many members closed as
+ * Failure: Negative with as many members closed as
* possible. The only subsequent operation
* permitted on the file is a close operation.
*
@@ -1123,8 +1123,7 @@ H5FD_multi_close(H5FD_t *_file)
*
* Return: Success: like strcmp()
*
- * Failure: never fails (arguments were checked by the
- * caller).
+ * Failure: never fails (arguments were checked by th caller).
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -1169,7 +1168,7 @@ H5FD_multi_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Quincey Koziol
* Tuesday, September 26, 2000
@@ -1201,7 +1200,7 @@ H5FD_multi_query(const H5FD_t *_f, unsigned long *flags /* out */)
* Purpose: Retrieve the memory type mapping for this file
*
* Return: Success: non-negative
- * Failure: negative
+ * Failure: negative
*
* Programmer: Quincey Koziol
* Tuesday, October 9, 2008
@@ -1229,7 +1228,7 @@ H5FD_multi_get_type_map(const H5FD_t *_file, H5FD_mem_t *type_map)
*
* Return: Success: The end-of-address-marker
*
- * Failure: HADDR_UNDEF
+ * Failure: HADDR_UNDEF
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -1321,7 +1320,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
*
* Return: Success: 0
*
- * Failure: -1
+ * Failure: -1
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -1383,7 +1382,7 @@ H5FD_multi_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa)
* the end of the multi of files or the current
* EOA, whichever is larger.
*
- * Failure: HADDR_UNDEF
+ * Failure: HADDR_UNDEF
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -1433,26 +1432,26 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type)
if(H5FD_MEM_DEFAULT == mmt)
mmt = type;
- if(file->memb[mmt]) {
+ if(file->memb[mmt]) {
/* Retrieve EOF */
H5E_BEGIN_TRY {
eof = H5FDget_eof(file->memb[mmt], mmt);
} H5E_END_TRY;
- if(HADDR_UNDEF == eof)
+ if(HADDR_UNDEF == eof)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eof", HADDR_UNDEF)
- if(eof > 0)
+ if(eof > 0)
eof += file->fa.memb_addr[mmt];
- } else if(file->fa.relax) {
- /*
- * The member is not open yet (maybe it doesn't exist). Make the
- * best guess about the end-of-file.
- */
- eof = file->memb_next[mmt];
- assert(HADDR_UNDEF != eof);
- } else {
+ } else if(file->fa.relax) {
+ /*
+ * The member is not open yet (maybe it doesn't exist). Make the
+ * best guess about the end-of-file.
+ */
+ eof = file->memb_next[mmt];
+ assert(HADDR_UNDEF != eof);
+ } else {
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eof", HADDR_UNDEF)
- }
+ }
}
return eof;
}
@@ -1496,7 +1495,7 @@ H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
*
* Return: Success: Address of new memory
*
- * Failure: HADDR_UNDEF
+ * Failure: HADDR_UNDEF
*
* Programmer: Robb Matzke
* Thursday, August 12, 1999
@@ -1551,7 +1550,7 @@ H5FD_multi_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
*
* Return: Success: 0
*
- * Failure: -1
+ * Failure: -1
*
* Programmer: Robb Matzke
* Thursday, August 12, 1999
@@ -1586,7 +1585,7 @@ H5FD_multi_free(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsi
* Return: Success: Zero. Result is stored in caller-supplied
* buffer BUF.
*
- * Failure: -1, contents of buffer BUF are undefined.
+ * Failure: -1, contents of buffer BUF are undefined.
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -1634,7 +1633,7 @@ H5FD_multi_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
*
* Return: Success: Zero
*
- * Failure: -1
+ * Failure: -1
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -1680,7 +1679,7 @@ H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
*
* Return: Success: 0
*
- * Failure: -1, as many files flushed as possible.
+ * Failure: -1, as many files flushed as possible.
*
* Programmer: Robb Matzke
* Wednesday, August 4, 1999
@@ -1751,7 +1750,7 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
* Purpose: Truncates all multi members.
*
* Return: Success: 0
- * Failure: -1, as many files truncated as possible.
+ * Failure: -1, as many files truncated as possible.
*
* Programmer: Quincey Koziol
* Thursday, January 31, 2008
@@ -1794,7 +1793,7 @@ H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
* member files that are locked before error is encountered.
*
* Return: Success: 0
- * Failure: -1
+ * Failure: -1
*
* Programmer: Vailin Choi; March 2015
*
@@ -1851,7 +1850,7 @@ H5FD_multi_lock(H5FD_t *_file, hbool_t rw)
* encountered.
*
* Return: Success: 0
- * Failure: -1
+ * Failure: -1
*
* Programmer: Vailin Choi; March 2015
*
@@ -1888,7 +1887,7 @@ H5FD_multi_unlock(H5FD_t *_file)
*
* Return: Success: 0
*
- * Failure: -1
+ * Failure: -1
*
* Programmer: Robb Matzke
* Monday, August 23, 1999
@@ -1929,7 +1928,7 @@ compute_next(H5FD_multi_t *file)
*
* Return: Success: 0
*
- * Failure: -1
+ * Failure: -1
*
* Programmer: Robb Matzke
* Monday, August 23, 1999
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index fa2be10..6dae0b4 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -119,19 +119,19 @@
* The macros take a subset of these arguments in the order listed here:
*
* CDATA: A pointer to the H5T_cdata_t structure that was passed to the
- * conversion function.
+ * conversion function.
*
* STYPE: The hid_t value for the source datatype.
*
* DTYPE: The hid_t value for the destination datatype.
*
- * BUF: A pointer to the conversion buffer.
+ * BUF: A pointer to the conversion buffer.
*
- * NELMTS: The number of values to be converted.
+ * NELMTS: The number of values to be converted.
*
- * ST: The C name for source datatype (e.g., int)
+ * ST: The C name for source datatype (e.g., int)
*
- * DT: The C name for the destination datatype (e.g., signed char)
+ * DT: The C name for the destination datatype (e.g., signed char)
*
* D_MIN: The minimum possible destination value. For unsigned
* destination types this should be zero. For signed
@@ -2585,7 +2585,7 @@ done:
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Monday, January 4, 1999
@@ -2727,7 +2727,7 @@ done:
*
* Return: Success: Non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Monday, January 4, 1999
@@ -2919,7 +2919,7 @@ done:
*
* Return: Success: Non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Raymond Lu
* 12 October 2012
@@ -3228,11 +3228,11 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
/* Check if conversion buffer is large enough, resize if
* necessary. If the SEQ_LEN is 0, allocate a minimal size buffer.
*/
- if(!seq_len && !conv_buf) {
+ if(!seq_len && !conv_buf) {
conv_buf_size = H5T_VLEN_MIN_CONF_BUF_SIZE;
if(NULL == (conv_buf = H5FL_BLK_CALLOC(vlen_seq, conv_buf_size)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
- } /* end if */
+ } /* end if */
else if(conv_buf_size < MAX(src_size, dst_size)) {
/* Only allocate conversion buffer in H5T_VLEN_MIN_CONF_BUF_SIZE increments */
conv_buf_size = ((MAX(src_size, dst_size) / H5T_VLEN_MIN_CONF_BUF_SIZE) + 1) * H5T_VLEN_MIN_CONF_BUF_SIZE;
@@ -4914,7 +4914,7 @@ done:
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Monday, November 16, 1998
@@ -4937,7 +4937,7 @@ H5T__conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Monday, November 16, 1998
@@ -4960,7 +4960,7 @@ H5T__conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -4983,7 +4983,7 @@ H5T__conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5006,7 +5006,7 @@ H5T__conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5029,7 +5029,7 @@ H5T__conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5052,7 +5052,7 @@ H5T__conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5075,7 +5075,7 @@ H5T__conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5098,7 +5098,7 @@ H5T__conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5121,7 +5121,7 @@ H5T__conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5144,7 +5144,7 @@ H5T__conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5167,7 +5167,7 @@ H5T__conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5190,7 +5190,7 @@ H5T__conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5213,7 +5213,7 @@ H5T__conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5236,7 +5236,7 @@ H5T__conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5259,7 +5259,7 @@ H5T__conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5282,7 +5282,7 @@ H5T__conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5305,7 +5305,7 @@ H5T__conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5328,7 +5328,7 @@ H5T__conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5351,7 +5351,7 @@ H5T__conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5374,7 +5374,7 @@ H5T__conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5397,7 +5397,7 @@ H5T__conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5420,7 +5420,7 @@ H5T__conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Monday, November 16, 1998
@@ -5443,7 +5443,7 @@ H5T__conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Monday, November 16, 1998
@@ -5466,7 +5466,7 @@ H5T__conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5489,7 +5489,7 @@ H5T__conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5512,7 +5512,7 @@ H5T__conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5535,7 +5535,7 @@ H5T__conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5558,7 +5558,7 @@ H5T__conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5581,7 +5581,7 @@ H5T__conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5604,7 +5604,7 @@ H5T__conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5627,7 +5627,7 @@ H5T__conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5650,7 +5650,7 @@ H5T__conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5673,7 +5673,7 @@ H5T__conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5696,7 +5696,7 @@ H5T__conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5719,7 +5719,7 @@ H5T__conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5742,7 +5742,7 @@ H5T__conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5765,7 +5765,7 @@ H5T__conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5788,7 +5788,7 @@ H5T__conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5811,7 +5811,7 @@ H5T__conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5834,7 +5834,7 @@ H5T__conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5857,7 +5857,7 @@ H5T__conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5880,7 +5880,7 @@ H5T__conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5903,7 +5903,7 @@ H5T__conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5926,7 +5926,7 @@ H5T__conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Monday, November 16, 1998
@@ -5949,7 +5949,7 @@ H5T__conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Monday, November 16, 1998
@@ -5972,7 +5972,7 @@ H5T__conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -5995,7 +5995,7 @@ H5T__conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6018,7 +6018,7 @@ H5T__conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6041,7 +6041,7 @@ H5T__conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6064,7 +6064,7 @@ H5T__conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6087,7 +6087,7 @@ H5T__conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6110,7 +6110,7 @@ H5T__conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6133,7 +6133,7 @@ H5T__conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6156,7 +6156,7 @@ H5T__conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6179,7 +6179,7 @@ H5T__conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6202,7 +6202,7 @@ H5T__conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6225,7 +6225,7 @@ H5T__conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6248,7 +6248,7 @@ H5T__conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6271,7 +6271,7 @@ H5T__conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6294,7 +6294,7 @@ H5T__conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6317,7 +6317,7 @@ H5T__conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6340,7 +6340,7 @@ H5T__conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6363,7 +6363,7 @@ H5T__conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6386,7 +6386,7 @@ H5T__conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6409,7 +6409,7 @@ H5T__conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6432,7 +6432,7 @@ H5T__conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Monday, November 16, 1998
@@ -6455,7 +6455,7 @@ H5T__conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Monday, November 16, 1998
@@ -6478,7 +6478,7 @@ H5T__conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6501,7 +6501,7 @@ H5T__conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6524,7 +6524,7 @@ H5T__conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6547,7 +6547,7 @@ H5T__conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6570,7 +6570,7 @@ H5T__conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6593,7 +6593,7 @@ H5T__conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6616,7 +6616,7 @@ H5T__conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6639,7 +6639,7 @@ H5T__conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6662,7 +6662,7 @@ H5T__conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6685,7 +6685,7 @@ H5T__conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6708,7 +6708,7 @@ H5T__conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6731,7 +6731,7 @@ H5T__conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6754,7 +6754,7 @@ H5T__conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6777,7 +6777,7 @@ H5T__conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6800,7 +6800,7 @@ H5T__conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6823,7 +6823,7 @@ H5T__conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6846,7 +6846,7 @@ H5T__conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6869,7 +6869,7 @@ H5T__conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6892,7 +6892,7 @@ H5T__conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6915,7 +6915,7 @@ H5T__conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: Non-negative
*
- * Failure: Negative
+ * Failure: Negative
*
* Programmer: Robb Matzke
* Friday, November 13, 1998
@@ -6938,7 +6938,7 @@ H5T__conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Monday, November 16, 1998
@@ -6961,7 +6961,7 @@ H5T__conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
* Return: Success: non-negative
*
- * Failure: negative
+ * Failure: negative
*
* Programmer: Robb Matzke
* Monday, November 16, 1998
@@ -9305,10 +9305,10 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
if (H5T_NORM_IMPLIED==dst.u.f.norm) {
/* Imply first bit */
H5T__bit_set(int_buf, first, (size_t)1, 0);
- }
- else if (H5T_NORM_NONE==dst.u.f.norm) {
- first++;
- }
+ }
+ else if (H5T_NORM_NONE==dst.u.f.norm) {
+ first++;
+ }
/* Roundup for mantissa */
if(first > dst.u.f.msize) {
@@ -9344,7 +9344,7 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
if(H5T__bit_get_d(int_buf, (first - dst.u.f.msize), (size_t)1))
do_round = 1;
}
- }
+ }
/* Right shift to drop off extra bits */
H5T__bit_shift(int_buf, (ssize_t)(dst.u.f.msize - first), (size_t)0, buf_size * 8);
@@ -9353,28 +9353,28 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
H5T__bit_inc(int_buf, (size_t)0, buf_size * 8);
do_round = 0;
- /* If integer is like 0x0ff...fff and we need to round up the
- * last f, we get 0x100...000. Treat this special case here.
- */
+ /* If integer is like 0x0ff...fff and we need to round up the
+ * last f, we get 0x100...000. Treat this special case here.
+ */
if(H5T__bit_get_d(int_buf, dst.u.f.msize, (size_t)1)) {
- if (H5T_NORM_IMPLIED==dst.u.f.norm) {
- /* The bit at this 1's position was impled already, so this
- * number should be 0x200...000. We need to increment the
- * exponent in this case.
- */
- expo++;
- } else if (H5T_NORM_NONE==dst.u.f.norm) {
- /* Right shift 1 bit to let the carried 1 fit in the mantissa,
- * and increment exponent by 1.
- */
+ if (H5T_NORM_IMPLIED==dst.u.f.norm) {
+ /* The bit at this 1's position was impled already, so this
+ * number should be 0x200...000. We need to increment the
+ * exponent in this case.
+ */
+ expo++;
+ } else if (H5T_NORM_NONE==dst.u.f.norm) {
+ /* Right shift 1 bit to let the carried 1 fit in the mantissa,
+ * and increment exponent by 1.
+ */
H5T__bit_shift(int_buf, (ssize_t)-1, (size_t)0, buf_size * 8);
- expo++;
- }
- }
+ expo++;
+ }
+ }
}
} else {
/* The bit sequence can fit mantissa part. Left shift to fit in from high-order of
- * bit position. */
+ * bit position. */
H5T__bit_shift(int_buf, (ssize_t)(dst.u.f.msize - first), (size_t)0, dst.u.f.msize);
}
diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index ab6b86c..a41e94c 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -720,22 +720,22 @@ H5T__get_native_float(size_t size, H5T_direction_t direction, size_t *struct_ali
if(direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
if(size<=sizeof(float)) {
match=H5T_NATIVE_FLOAT_MATCH_FLOAT;
- native_size = sizeof(float);
+ native_size = sizeof(float);
}
else if(size<=sizeof(double)) {
match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
- native_size = sizeof(double);
+ native_size = sizeof(double);
}
#if H5_SIZEOF_LONG_DOUBLE !=0
else if(size<=sizeof(long double)) {
match=H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
- native_size = sizeof(long double);
+ native_size = sizeof(long double);
}
#endif
else { /* If not match, return the biggest datatype */
#if H5_SIZEOF_LONG_DOUBLE !=0
match=H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
- native_size = sizeof(long double);
+ native_size = sizeof(long double);
#else
match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
native_size = sizeof(double);
@@ -745,25 +745,25 @@ H5T__get_native_float(size_t size, H5T_direction_t direction, size_t *struct_ali
#if H5_SIZEOF_LONG_DOUBLE !=0
if(size>sizeof(double)) {
match=H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
- native_size = sizeof(long double);
+ native_size = sizeof(long double);
}
else if(size>sizeof(float)) {
match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
- native_size = sizeof(double);
+ native_size = sizeof(double);
}
else {
match=H5T_NATIVE_FLOAT_MATCH_FLOAT;
- native_size = sizeof(float);
- }
+ native_size = sizeof(float);
+ }
#else
if(size>sizeof(float)) {
match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
- native_size = sizeof(double);
+ native_size = sizeof(double);
}
else {
match=H5T_NATIVE_FLOAT_MATCH_FLOAT;
- native_size = sizeof(float);
- }
+ native_size = sizeof(float);
+ }
#endif
}
@@ -910,7 +910,7 @@ H5_GCC_DIAG_ON("duplicated-branches")
*
* Return: Success: Non-negative value.
*
- * Failure: Negative value.
+ * Failure: Negative value.
*
* Programmer: Raymond Lu
* December 10, 2002
diff --git a/src/H5VMprivate.h b/src/H5VMprivate.h
index 0c69ba6..56f48e0 100644
--- a/src/H5VMprivate.h
+++ b/src/H5VMprivate.h
@@ -204,7 +204,7 @@ H5VM_vector_zerop_u(int n, const hsize_t *v)
if (!v)
HGOTO_DONE(TRUE)
while (n--)
- if (*v++)
+ if (*v++)
HGOTO_DONE(FALSE)
done:
@@ -241,7 +241,7 @@ H5VM_vector_zerop_s(int n, const hssize_t *v)
if (!v)
HGOTO_DONE(TRUE)
while (n--)
- if (*v++)
+ if (*v++)
HGOTO_DONE(FALSE)
done:
@@ -530,9 +530,9 @@ static const unsigned char H5VM_bit_clear_g[8] = {0x7F, 0xBF, 0xDF, 0xEF, 0xF7,
*
* Purpose: Determine the value of the n'th bit in a buffer.
*
- * Note: No range checking on <offset> is performed!
+ * Note: No range checking on <offset> is performed!
*
- * Note #2: Bits are sequentially stored in the buffer, starting with bit
+ * Note #2: Bits are sequentially stored in the buffer, starting with bit
* offset 0 in the first byte's high-bit position, proceeding down
* to bit offset 7 in the first byte's low-bit position, then to
* bit offset 8 in the second byte's high-bit position, etc.
@@ -561,9 +561,9 @@ H5VM_bit_get(const unsigned char *buf, size_t offset)
*
* Purpose: Set/reset the n'th bit in a buffer.
*
- * Note: No range checking on <offset> is performed!
+ * Note: No range checking on <offset> is performed!
*
- * Note #2: Bits are sequentially stored in the buffer, starting with bit
+ * Note #2: Bits are sequentially stored in the buffer, starting with bit
* offset 0 in the first byte's high-bit position, proceeding down
* to bit offset 7 in the first byte's low-bit position, then to
* bit offset 8 in the second byte's high-bit position, etc.