[svn-r3326] Purpose:

    Clean up warnings
Description:
    The "FAILED" macro is defined by Windows and is causing warnings and
    potential errors when compiled on that platform.
Solution:
    Change our macro from FAILED to H5_FAILED.
Platforms tested:
    FreeBSD 4.2 (hawkwind)

1 files changed, 24 insertions, 24 deletions

diff --git a/test/ohdr.c b/test/ohdr.c
index 114ac02..8cc61d1 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -63,7 +63,7 @@ main(void)
      */
     TESTING("object header creation");
     if (H5O_create(f, 64, &oh_ent/*out*/)<0) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
@@ -74,23 +74,23 @@ main(void)
     stab.btree_addr = 11111111;
     stab.heap_addr = 22222222;
     if (H5O_modify(&oh_ent, H5O_STAB, H5O_NEW_MESG, 0, &stab)<0) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
     if (H5AC_flush(f, NULL, HADDR_UNDEF, TRUE)<0) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
     if (NULL==H5O_read(&oh_ent, H5O_STAB, 0, &ro)) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
     if (H5F_addr_ne(ro.btree_addr, stab.btree_addr) ||
 	H5F_addr_ne(ro.heap_addr, stab.heap_addr)) {
-	FAILED();
+	H5_FAILED();
 	HDfprintf(stdout, "    got: {%a, %a}\n",
 		  ro.btree_addr, ro.heap_addr);
 	HDfprintf(stdout, "    ans: {%a, %a}\n",
@@ -106,23 +106,23 @@ main(void)
     stab.btree_addr = 33333333;
     stab.heap_addr = 44444444;
     if (H5O_modify(&oh_ent, H5O_STAB, 0, 0, &stab)<0) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
     if (H5AC_flush(f, NULL, HADDR_UNDEF, TRUE)<0) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
     if (NULL==H5O_read(&oh_ent, H5O_STAB, 0, &ro)) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
     if (H5F_addr_ne(ro.btree_addr, stab.btree_addr) ||
 	H5F_addr_ne(ro.heap_addr, stab.heap_addr)) {
-	FAILED();
+	H5_FAILED();
 	HDfprintf(stdout, "    got: {%a, %a}\n",
 		  ro.btree_addr, ro.heap_addr);
 	HDfprintf(stdout, "    ans: {%a, %a}\n",
@@ -139,23 +139,23 @@ main(void)
     stab.btree_addr = 55555555;
     stab.heap_addr = 66666666;
     if (H5O_modify(&oh_ent, H5O_STAB, H5O_NEW_MESG, 0, &stab)<0) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
     if (H5AC_flush(f, NULL, HADDR_UNDEF, TRUE)<0) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
     if (NULL==H5O_read(&oh_ent, H5O_STAB, 1, &ro)) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
     if (H5F_addr_ne(ro.btree_addr, stab.btree_addr) ||
 	H5F_addr_ne(ro.heap_addr, stab.heap_addr)) {
-	FAILED();
+	H5_FAILED();
 	HDfprintf(stdout, "    got: {%a, %a}\n",
 		  ro.btree_addr, ro.heap_addr);
 	HDfprintf(stdout, "    ans: {%a, %a}\n",
@@ -171,23 +171,23 @@ main(void)
     stab.btree_addr = 77777777;
     stab.heap_addr = 88888888;
     if (H5O_modify(&oh_ent, H5O_STAB, 1, 0, &stab)<0) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
     if (H5AC_flush(f, NULL, HADDR_UNDEF, TRUE)<0) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
     if (NULL==H5O_read(&oh_ent, H5O_STAB, 1, &ro)) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
     if (H5F_addr_ne(ro.btree_addr, stab.btree_addr) ||
 	H5F_addr_ne(ro.heap_addr, stab.heap_addr)) {
-	FAILED();
+	H5_FAILED();
 	HDfprintf(stdout, "    got: {%a, %a}\n",
 		  ro.btree_addr, ro.heap_addr);
 	HDfprintf(stdout, "    ans: {%a, %a}\n",
@@ -205,13 +205,13 @@ main(void)
         stab.btree_addr = (i+1)*1000+1;
         stab.heap_addr = (i+1)*1000+2;
         if (H5O_modify(&oh_ent, H5O_STAB, H5O_NEW_MESG, 0, &stab)<0) {
-	    FAILED();
+	    H5_FAILED();
 	    H5Eprint(stdout);
 	    goto error;
 	}
     }
     if (H5AC_flush(f, NULL, HADDR_UNDEF, TRUE)<0) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
@@ -226,12 +226,12 @@ main(void)
         stab.btree_addr = (i + 1) * 1000 + 10;
         stab.heap_addr = (i + 1) * 1000 + 20;
         if (H5O_modify(&oh_ent, H5O_STAB, H5O_NEW_MESG, 0, &stab)<0) {
-	    FAILED();
+	    H5_FAILED();
 	    H5Eprint(stdout);
 	    goto error;
 	}
         if (H5AC_flush(f, NULL, HADDR_UNDEF, TRUE)<0) {
-	    FAILED();
+	    H5_FAILED();
 	    H5Eprint(stdout);
 	    goto error;
 	}
@@ -243,12 +243,12 @@ main(void)
      */
     TESTING("message deletion");
     if (H5O_remove(&oh_ent, H5O_STAB, H5O_ALL)<0) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }
     if (H5O_read(&oh_ent, H5O_STAB, 0, &ro)) {
-	FAILED();
+	H5_FAILED();
 	puts("    H5O_read() should have failed but didn't");
 	H5Eclear();
 	goto error;
@@ -259,7 +259,7 @@ main(void)
     /* release resources */
     TESTING("object header closing");
     if (H5O_close(&oh_ent)<0) {
-	FAILED();
+	H5_FAILED();
 	H5Eprint(stdout);
 	goto error;
     }