fix merge issues

2 files changed, 19 insertions, 22 deletions

diff --git a/src/H5FDonion.c b/src/H5FDonion.c
index d019781..4137c3b 100644
--- a/src/H5FDonion.c
+++ b/src/H5FDonion.c
@@ -395,7 +395,7 @@ static hsize_t
 H5FD__onion_sb_size(H5FD_t *_file)
 {
     H5FD_onion_t *file      = (H5FD_onion_t *)_file;
-    hsize_t          ret_value = 0;
+    hsize_t       ret_value = 0;
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -414,7 +414,7 @@ static herr_t
 H5FD__onion_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out*/)
 {
     H5FD_onion_t *file      = (H5FD_onion_t *)_file;
-    herr_t           ret_value = SUCCEED; /* Return value */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -434,7 +434,7 @@ static herr_t
 H5FD__onion_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
 {
     H5FD_onion_t *file      = (H5FD_onion_t *)_file;
-    herr_t           ret_value = SUCCEED; /* Return value */
+    herr_t        ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -2015,7 +2015,7 @@ H5FD__onion_open(const char *filename, unsigned flags, hid_t fapl_id, haddr_t ma
                 unsigned char *                     wh_buf     = NULL;
                 uint64_t                            size       = 0;
                 uint64_t                            saved_size = 0;
-				haddr_t								canon_eof  = 0;
+                haddr_t                             canon_eof  = 0;
 
                 HDassert(file != NULL);
 
@@ -2029,16 +2029,13 @@ H5FD__onion_open(const char *filename, unsigned flags, hid_t fapl_id, haddr_t ma
                 if (H5FD_ONION_FAPL_INFO_CREATE_FLAG_ENABLE_PAGE_ALIGNMENT & file->fa.creation_flags)
                     hdr_p->flags |= H5FD__ONION_HEADER_FLAG_PAGE_ALIGNMENT;
 
-                // TODO: is this right?
-				if (HADDR_UNDEF == (canon_eof = H5FD_get_eof(file->backing_canon, H5FD_MEM_DEFAULT))) {
-					HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "cannot get size of canonical file")
-				}
-				printf("\n\n\n\nEOA: %d\n\n\n\n", H5FD_get_eoa(file->backing_canon, H5FD_MEM_DEFAULT));
-				if (H5FD_set_eoa(file->backing_canon, H5FD_MEM_DRAW, canon_eof) < 0)
+                if (HADDR_UNDEF == (canon_eof = H5FD_get_eof(file->backing_canon, H5FD_MEM_DEFAULT))) {
+                    HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "cannot get size of canonical file")
+                }
+                if (H5FD_set_eoa(file->backing_canon, H5FD_MEM_DRAW, canon_eof) < 0)
                     HGOTO_ERROR(H5E_FILE, H5E_CANTSET, NULL, "can't extend EOA")
-				printf("\n\n\n\nEOA: %d\n\n\n\n", H5FD_get_eoa(file->backing_canon, H5FD_MEM_DEFAULT));
                 hdr_p->origin_eof = canon_eof;
-				file->logi_eof = canon_eof;
+                file->logi_eof    = canon_eof;
 
                 if (H5FD__onion_set_userinfo_in_record(rec_p) < 0)
                     HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "Can't record user info")
@@ -2049,7 +2046,8 @@ H5FD__onion_open(const char *filename, unsigned flags, hid_t fapl_id, haddr_t ma
 
                 /* Create backing files for onion history */
 
-                if ((file->backing_onion = H5FD_open(name_onion, (H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC),
+                if ((file->backing_onion =
+                         H5FD_open(name_onion, (H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC),
                                    backing_fapl_id, maxaddr)) == NULL) {
                     HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "cannot open the backing onion file")
                 }
@@ -2079,7 +2077,7 @@ H5FD__onion_open(const char *filename, unsigned flags, hid_t fapl_id, haddr_t ma
                 if (H5FD_set_eoa(file->backing_onion, H5FD_MEM_DRAW, saved_size + size + 1) < 0)
                     HGOTO_ERROR(H5E_FILE, H5E_CANTSET, NULL, "can't extend EOA")
                 
-                /* must use public API to correclty set DXPL context :( */
+				/* must use public API to correclty set DXPL context :( */
                 if (H5FDwrite(file->backing_onion, H5FD_MEM_DRAW, H5P_DEFAULT, 0, saved_size, head_buf) < 0) {
                     HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, NULL,
                                 "cannot write header to the backing onion file")
@@ -2159,11 +2157,10 @@ H5FD__onion_open(const char *filename, unsigned flags, hid_t fapl_id, haddr_t ma
         }
     }
 
-	printf("\n\n\n\norigin_eof: %d, logi_eof: %d, logi_eof2: %d\n\n\n\n", file->header.origin_eof, file->rev_record.logi_eof, file->logi_eof);
     file->origin_eof = file->header.origin_eof;
     file->logi_eof   = MAX(file->rev_record.logi_eof, file->logi_eof);
-    //file->logi_eof   = file->rev_record.logi_eof;
-    file->logi_eoa   = 0;
+    // file->logi_eof   = file->rev_record.logi_eof;
+    file->logi_eoa = 0;
 
     file->history_eof = H5FD_get_eoa(file->backing_onion, H5FD_MEM_DRAW);
     if (TRUE == file->page_align_history)
diff --git a/test/onion.c b/test/onion.c
index 4193559..4ee3b0e 100644
--- a/test/onion.c
+++ b/test/onion.c
@@ -3211,7 +3211,7 @@ test_integration_create(void)
     fflush(stdout);
 
     file_id = H5Fopen(paths->canon, H5F_ACC_RDWR, fapl_id);
-    //file_id = H5Fopen(paths->canon, H5F_ACC_RDWR, H5P_DEFAULT);
+    // file_id = H5Fopen(paths->canon, H5F_ACC_RDWR, H5P_DEFAULT);
 
     HDputs(".");
     fflush(stdout);
@@ -3272,10 +3272,10 @@ test_integration_create(void)
 error:
 
     if (paths != NULL) {
-        //HDremove(paths->canon);
-        //HDremove(paths->onion);
-        //HDremove(paths->recovery);
-        //onion_filepaths_destroy(paths);
+        HDremove(paths->canon);
+        HDremove(paths->onion);
+        HDremove(paths->recovery);
+        onion_filepaths_destroy(paths);
     }
 
     if (dset != H5I_INVALID_HID)