From 9ac7e094235297eedcf1e245167af1dabf471aab Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 22 Jun 2016 16:01:46 +0200
Subject: [PATCH] src/include/h5core/h5_file_attribs.h
 src/include/h5core/h5_step_attribs.h src/include/h5core/h5b_attribs.h: - use
 new H5hut enum type for attribute data-types

---
 src/include/h5core/h5_file_attribs.h | 13 ++++++++-----
 src/include/h5core/h5_step_attribs.h | 13 ++++++++-----
 src/include/h5core/h5b_attribs.h     |  5 +----
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/include/h5core/h5_file_attribs.h b/src/include/h5core/h5_file_attribs.h
index 729aad8..0a1e2c8 100644
--- a/src/include/h5core/h5_file_attribs.h
+++ b/src/include/h5core/h5_file_attribs.h
@@ -23,7 +23,8 @@ h5_has_file_attrib (
 
 h5_err_t
 h5_get_file_attrib_info_by_name (
-	const h5_file_t, const char* const, h5_int64_t* const, h5_size_t*);
+	const h5_file_t, const char* const,
+	h5_int64_t* const, h5_size_t* const);
 
 h5_ssize_t
 h5_get_num_file_attribs (
@@ -31,16 +32,18 @@ h5_get_num_file_attribs (
 
 h5_err_t
 h5_get_file_attrib_info_by_idx (
-	const h5_file_t, const h5_size_t, char*, const h5_size_t, h5_int64_t* const,
-	h5_size_t*);
+	const h5_file_t, const h5_size_t, char* const, const h5_size_t,
+	h5_int64_t* const, h5_size_t* const);
 
 h5_err_t
 h5_read_file_attrib (
-	const h5_file_t, const char*, const hid_t, void*);
+	const h5_file_t, const char* const, const h5_types_t,
+	void* const);
 
 h5_err_t
 h5_write_file_attrib (
-	const h5_file_t, const char*, const hid_t, const void*, const hsize_t);
+	const h5_file_t, const char* const, const h5_types_t,
+	const void* const, const h5_size_t);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/h5core/h5_step_attribs.h b/src/include/h5core/h5_step_attribs.h
index 1111b88..3507c70 100644
--- a/src/include/h5core/h5_step_attribs.h
+++ b/src/include/h5core/h5_step_attribs.h
@@ -23,7 +23,8 @@ h5_has_step_attrib (
 
 h5_err_t
 h5_get_step_attrib_info_by_name (
-	const h5_file_t, const char* const, h5_int64_t*, h5_size_t*);
+	const h5_file_t, const char* const,
+	h5_int64_t* const, h5_size_t* const);
 
 h5_ssize_t
 h5_get_num_step_attribs (
@@ -31,16 +32,18 @@ h5_get_num_step_attribs (
 
 h5_err_t
 h5_get_step_attrib_info_by_idx (
-	const h5_file_t, const h5_size_t, char*, const h5_size_t, h5_int64_t*,
-	h5_size_t*);
+	const h5_file_t, const h5_size_t, char* const, const h5_size_t,
+	h5_int64_t* const, h5_size_t* const);
 
 h5_err_t
 h5_read_step_attrib (
-	const h5_file_t, const char*, const hid_t, void*);
+	const h5_file_t, const char* const, const h5_types_t,
+	void* const);
 
 h5_err_t
 h5_write_step_attrib (
-	const h5_file_t, const char*, const hid_t, const void*, const hsize_t);
+	const h5_file_t, const char* const, const h5_types_t,
+	const void* const, const h5_size_t);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/h5core/h5b_attribs.h b/src/include/h5core/h5b_attribs.h
index 99c371d..1504cd9 100644
--- a/src/include/h5core/h5b_attribs.h
+++ b/src/include/h5core/h5b_attribs.h
@@ -13,9 +13,6 @@
 #include "h5core/h5_types.h"
 #include <hdf5.h>
 
-/*
-  :TODO: move macros to private include file
-*/
 #define H5BLOCK_FIELD_ORIGIN_NAME	"__Origin__"
 #define H5BLOCK_FIELD_SPACING_NAME	"__Spacing__"
 #define H5BLOCK_FIELD_XCOORD_NAME	"__X_Coordinates__"
@@ -54,7 +51,7 @@ h5b_get_field_attrib_info_by_name (
 h5_err_t
 h5b_write_field_attrib (
 	const h5_file_t,
-        const char*, const char*, const hid_t, const void*, const h5_int64_t);
+        const char*, const char*, const h5_int64_t, const void*, const h5_int64_t);
 
 h5_err_t
 h5b_read_field_attrib (