- removed "h5_file_t f" argument where we don't need need (but not in API)

- removed arguments from macros h5_error_internal() h5_error_not_implemented()
- some coding style issues fixed

src/include/h5core/h5_core.h

@@ -125,6 +125,13 @@ done:						\
 		goto done;						\
 	}
 
+#define TRY3( expr, ret_val )						\
+	if ((int64_t)(ptrdiff_t)(expr) <= (int64_t)H5_ERR) {		\
+		ret_value = ret_val;					\
+		goto done;						\
+	}
+#define ON_ERROR
+
 #include "h5_types.h"
 #include "h5_errno.h"
 

src/include/h5core/h5_errorhandling.h

@@ -64,17 +64,17 @@ h5_initialize (
 			H5_ERR_INVAL,					\
 			"Time step is invalid! Have you set the time step?");
 
-#define h5_error_not_implemented( file, func, lino )		     \
+#define h5_error_not_implemented()				     \
 	h5_error(						     \
 		H5_ERR_NOT_IMPLEMENTED,				     \
 		"%s: Function \"%s\", line %d not yet implemented!", \
-		file, func, lino );
+		__FILE__, __func__, __LINE__);
 
-#define h5_error_internal( file, func, lino )   \
+#define h5_error_internal()   \
 	h5_error(				   \
 		H5_ERR_INTERNAL,		   \
 		"%s: Internal error: %s line %d!", \
-		file, func, lino )
+		__FILE__, __func__, __LINE__)
 
 
 h5_err_t

src/include/h5core/h5_readwrite.h

@@ -9,7 +9,6 @@ h5_set_step (
 
 h5_int64_t
 h5_normalize_h5_type (
-	h5_file_t * const f,
 	hid_t type
 	);
 
@@ -28,7 +27,6 @@ h5_has_index (
 
 h5_err_t
 h5_normalize_dataset_name (
-	h5_file_t *const f,
 	const char *name,
 	char *name2
 	);