merge errors fixed

src/C/H5.c

@@ -127,14 +127,9 @@ H5SetStepNameFormat (
 	const char* name,		/*!< Prefix			*/
 	const h5_int64_t width		/*!< Width of the number	*/
 	) {
-<<<<<<< .working
-	H5_API_ENTER3 (h5_err_t,
-		       "f=%p, name=\"%s\", width=%lld",
-		       f, name, (long long) width);
-=======
-	H5_API_ENTER (h5_err_t, "f=%p, name='%s', width=%lld",
+	H5_API_ENTER (h5_err_t,
+		      "f=%p, name='%s', width=%lld",
 		      f, name, (long long) width);
->>>>>>> .merge-right.r3679
 	H5_API_RETURN (h5_set_stepname_fmt (f, name, width));
 }
 
@@ -153,15 +148,9 @@ H5GetStepNameFormat (
 	const h5_size_t l_name,		/*!< length of buffer name	*/
 	int* width			/*!< OUT: Width of the number	*/
 	) {
-<<<<<<< .working
-	H5_API_ENTER4 (h5_err_t,
-		       "f=%p, name=%p, l_name=%llu, width=%p",
-		       f, name, (unsigned long long)l_name, width);
-=======
 	H5_API_ENTER (h5_err_t,
 		      "f=%p, name=%p, l_name=%llu, width=%p",
 		      f, name, (unsigned long long)l_name, width);
->>>>>>> .merge-right.r3679
 	H5_API_RETURN (h5_get_stepname_fmt (f, name, l_name, width));
 }
 
@@ -177,11 +166,7 @@ H5SetStep (
 	h5_file_t* const f,		/*!< [in]  Handle to open file */
 	const h5_id_t step		/*!< [in]  Step to set. */
 	) {
-<<<<<<< .working
-	H5_API_ENTER2 (h5_err_t, "f=%p, step=%lld", f, (long long)step);
-=======
 	H5_API_ENTER (h5_err_t, "f=%p, step=%lld", f, (long long)step);
->>>>>>> .merge-right.r3679
 	H5_API_RETURN (h5_set_step (f, step));
 }
 
@@ -196,11 +181,7 @@ h5_id_t
 H5GetStep (
 	h5_file_t* const f		/*!< Handle to open file */
 	) {
-<<<<<<< .working
-	H5_API_ENTER1 (h5_err_t, "f=%p", f);
-=======
 	H5_API_ENTER (h5_err_t, "f=%p", f);
->>>>>>> .merge-right.r3679
 	H5_API_RETURN (h5_get_step (f));
 }
 
@@ -218,11 +199,7 @@ int
 H5GetNumProcs (
 	h5_file_t* const f
 	) {
-<<<<<<< .working
-	H5_API_ENTER1 (h5_err_t, "f=%p", f);
-=======
 	H5_API_ENTER (h5_err_t, "f=%p", f);
->>>>>>> .merge-right.r3679
 	H5_API_RETURN (h5_get_num_procs(f));
 }
 
@@ -243,11 +220,7 @@ h5_ssize_t
 H5GetNumSteps (
 	h5_file_t* const f
 	) {
-<<<<<<< .working
-	H5_API_ENTER1 (h5_err_t, "f=%p", f);
-=======
 	H5_API_ENTER (h5_err_t, "f=%p", f);
->>>>>>> .merge-right.r3679
 	H5_API_RETURN (h5_get_num_steps(f));
 }
 
@@ -266,14 +239,9 @@ H5HasStep (
 	h5_file_t* const f,
 	h5_id_t stepno
 	) {
-<<<<<<< .working
-	H5_API_ENTER2 (h5_err_t,
-		       "f=%p, stepno=%lld",
-		       f,
-		       (long long)stepno);
-=======
-	H5_API_ENTER (h5_err_t, "f=%p, stepno=%lld", f, (long long)stepno);
->>>>>>> .merge-right.r3679
+	H5_API_ENTER (h5_err_t, 
+		      "f=%p, stepno=%lld",
+		      f, (long long)stepno);
 	H5_API_RETURN (h5_has_step (f, stepno));
 }
 
@@ -288,11 +256,7 @@ h5_err_t
 H5StartTraverseSteps (
 	h5_file_t* const f		/*!< Handle to open file */
 	) {
-<<<<<<< .working
-	H5_API_ENTER1 (h5_err_t, "f=%p", f);
-=======
 	H5_API_ENTER (h5_err_t, "f=%p", f);
->>>>>>> .merge-right.r3679
 	H5_API_RETURN (h5_start_traverse_steps (f));
 }
 
@@ -307,11 +271,7 @@ h5_err_t
 H5TraverseSteps (
 	h5_file_t* const f		/*!< Handle to open file */
 	) {
-<<<<<<< .working
-	H5_API_ENTER1 (h5_err_t, "f=%p", f);
-=======
 	H5_API_ENTER (h5_err_t, "f=%p", f);
->>>>>>> .merge-right.r3679
 	H5_API_RETURN (h5_traverse_steps (f));
 }
 
@@ -337,11 +297,7 @@ H5SetThrottle (
 	h5_file_t* f,
 	int factor
 	) {
-<<<<<<< .working
-	H5_API_ENTER2 (h5_err_t, "f=%p, factor=%d", f, factor);
-=======
 	H5_API_ENTER (h5_err_t, "f=%p, factor=%d", f, factor);
->>>>>>> .merge-right.r3679
 	H5_API_RETURN (h5_set_throttle(f, factor));
 }
 #endif // PARALLEL_IO
@@ -371,11 +327,7 @@ h5_err_t
 H5SetErrorHandler (
 	h5_errorhandler_t handler
 	) {
-<<<<<<< .working
-	H5_API_ENTER1 (h5_err_t, "handler=%p", handler);
-=======
 	H5_API_ENTER (h5_err_t, "handler=%p", handler);
->>>>>>> .merge-right.r3679
 	H5_API_RETURN (h5_set_errorhandler (handler));
 }