[svn-r13648] Description:

    Rename new error handling API routines from H5E<foo>_stack() to
H5E<foo>2().

Tested on:
    Mac OS X/32 10.4.9 (amazon)
    FreeBSD/32 6.2 (duty)
    FreeBSD/64 6.2 (liberty)

1 files changed, 14 insertions, 14 deletions

diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index 7498ae7..6f1b204 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -32,7 +32,7 @@
 /* Disable certain warnings in PC-Lint: */
 /*lint --emacro( {534, 830}, H5P_FILE_ACCESS) */
 /*lint --emacro( {534, 830}, H5F_ACC_RDWR, H5F_ACC_EXCL) */
-/*lint -esym( 534, H5Eclear_stack, H5Epush_stack) */
+/*lint -esym( 534, H5Eclear2, H5Epush2) */
 
 #include "hdf5.h"
 
@@ -222,7 +222,7 @@ hid_t
 H5FD_stdio_init(void)
 {
     /* Clear the error stack */
-    H5Eclear_stack(H5E_DEFAULT);
+    H5Eclear2(H5E_DEFAULT);
 
     if (H5I_VFL!=H5Iget_type(H5FD_STDIO_g))
         H5FD_STDIO_g = H5FDregister(&H5FD_stdio_g);
@@ -278,7 +278,7 @@ H5Pset_fapl_stdio(hid_t fapl_id)
     /*NO TRACE*/
 
     /* Clear the error stack */
-    H5Eclear_stack(H5E_DEFAULT);
+    H5Eclear2(H5E_DEFAULT);
 
     if(0 == H5Pisa_class(fapl_id, H5P_FILE_ACCESS))
         H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADTYPE, "not a file access property list", -1)
@@ -338,7 +338,7 @@ H5FD_stdio_open( const char *name, unsigned flags, hid_t fapl_id,
     fapl_id=fapl_id;
 
     /* Clear the error stack */
-    H5Eclear_stack(H5E_DEFAULT);
+    H5Eclear2(H5E_DEFAULT);
 
     /* Check arguments */
     if (!name || !*name)
@@ -434,7 +434,7 @@ H5FD_stdio_close(H5FD_t *_file)
     static const char *func="H5FD_stdio_close";  /* Function Name for error reporting */
 
     /* Clear the error stack */
-    H5Eclear_stack(H5E_DEFAULT);
+    H5Eclear2(H5E_DEFAULT);
 
     if (fclose(file->fp) < 0)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_CLOSEERROR, "fclose failed", -1)
@@ -471,7 +471,7 @@ H5FD_stdio_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
     const H5FD_stdio_t	*f2 = (const H5FD_stdio_t*)_f2;
 
     /* Clear the error stack */
-    H5Eclear_stack(H5E_DEFAULT);
+    H5Eclear2(H5E_DEFAULT);
 
 #ifdef WIN32
     if (f1->fileindexhi < f2->fileindexhi) return -1;
@@ -568,7 +568,7 @@ H5FD_stdio_alloc(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxp
     dxpl_id = dxpl_id;
 
     /* Clear the error stack */
-    H5Eclear_stack(H5E_DEFAULT);
+    H5Eclear2(H5E_DEFAULT);
 
     /* Compute the address for the block to allocate */
     addr = file->eoa;
@@ -624,7 +624,7 @@ H5FD_stdio_get_eoa(const H5FD_t *_file, H5FD_mem_t /*unused*/ type)
     const H5FD_stdio_t	*file = (const H5FD_stdio_t *)_file;
 
     /* Clear the error stack */
-    H5Eclear_stack(H5E_DEFAULT);
+    H5Eclear2(H5E_DEFAULT);
 
     /* Shut compiler up */
     type = type;
@@ -661,7 +661,7 @@ H5FD_stdio_set_eoa(H5FD_t *_file, H5FD_mem_t /*unused*/ type, haddr_t addr)
     H5FD_stdio_t	*file = (H5FD_stdio_t*)_file;
 
     /* Clear the error stack */
-    H5Eclear_stack(H5E_DEFAULT);
+    H5Eclear2(H5E_DEFAULT);
 
     /* Shut compiler up */
     type = type;
@@ -699,7 +699,7 @@ H5FD_stdio_get_eof(const H5FD_t *_file)
     const H5FD_stdio_t	*file = (const H5FD_stdio_t *)_file;
 
     /* Clear the error stack */
-    H5Eclear_stack(H5E_DEFAULT);
+    H5Eclear2(H5E_DEFAULT);
 
     return(MAX(file->eof, file->eoa));
 }
@@ -729,7 +729,7 @@ H5FD_stdio_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
     fapl=fapl;
 
     /* Clear the error stack */
-    H5Eclear_stack(H5E_DEFAULT);
+    H5Eclear2(H5E_DEFAULT);
 
     *file_handle = &(file->fp);
     if(*file_handle==NULL)
@@ -775,7 +775,7 @@ H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, siz
     dxpl_id=dxpl_id;
 
     /* Clear the error stack */
-    H5Eclear_stack(H5E_DEFAULT);
+    H5Eclear2(H5E_DEFAULT);
 
     /* Check for overflow */
     if (HADDR_UNDEF==addr)
@@ -877,7 +877,7 @@ H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
     type=type;
 
     /* Clear the error stack */
-    H5Eclear_stack(H5E_DEFAULT);
+    H5Eclear2(H5E_DEFAULT);
 
     /* Check for overflow conditions */
     if (HADDR_UNDEF==addr)
@@ -958,7 +958,7 @@ H5FD_stdio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
     dxpl_id=dxpl_id;
 
     /* Clear the error stack */
-    H5Eclear_stack(H5E_DEFAULT);
+    H5Eclear2(H5E_DEFAULT);
 
     /* Only try to flush the file if we have write access */
     if(file->write_access) {