58 lines
3.2 KiB
Diff
58 lines
3.2 KiB
Diff
From d6b267d980b391561047af0e573d26140c7d35bd Mon Sep 17 00:00:00 2001
|
|
From: David Hoese <david.hoese@ssec.wisc.edu>
|
|
Date: Fri, 1 Dec 2023 09:49:29 -0600
|
|
Subject: [PATCH] Fix get_eof exception definition
|
|
|
|
---
|
|
h5py/api_types_hdf5.pxd | 4 ++--
|
|
h5py/h5fd.pyx | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/h5py/api_types_hdf5.pxd b/h5py/api_types_hdf5.pxd
|
|
index 6e2fc239..099e0f58 100644
|
|
--- a/h5py/api_types_hdf5.pxd
|
|
+++ b/h5py/api_types_hdf5.pxd
|
|
@@ -272,7 +272,7 @@ cdef extern from "hdf5.h":
|
|
herr_t (*free)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size)
|
|
haddr_t (*get_eoa)(const H5FD_t *file, H5FD_mem_t type) noexcept
|
|
herr_t (*set_eoa)(H5FD_t *file, H5FD_mem_t type, haddr_t addr) noexcept
|
|
- haddr_t (*get_eof)(const H5FD_t *file, H5FD_mem_t type) noexcept
|
|
+ haddr_t (*get_eof)(const H5FD_t *file, H5FD_mem_t type) except -1
|
|
herr_t (*get_handle)(H5FD_t *file, hid_t fapl, void**file_handle)
|
|
herr_t (*read)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, void *buffer) except *
|
|
herr_t (*write)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, const void *buffer) except *
|
|
@@ -310,7 +310,7 @@ cdef extern from "hdf5.h":
|
|
herr_t (*free)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size)
|
|
haddr_t (*get_eoa)(const H5FD_t *file, H5FD_mem_t type) noexcept
|
|
herr_t (*set_eoa)(H5FD_t *file, H5FD_mem_t type, haddr_t addr) noexcept
|
|
- haddr_t (*get_eof)(const H5FD_t *file, H5FD_mem_t type) noexcept
|
|
+ haddr_t (*get_eof)(const H5FD_t *file, H5FD_mem_t type) except -1
|
|
herr_t (*get_handle)(H5FD_t *file, hid_t fapl, void**file_handle)
|
|
herr_t (*read)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, void *buffer) except *
|
|
herr_t (*write)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, const void *buffer) except *
|
|
diff --git a/h5py/h5fd.pyx b/h5py/h5fd.pyx
|
|
index 5e2ea9cd..d39cf68f 100644
|
|
--- a/h5py/h5fd.pyx
|
|
+++ b/h5py/h5fd.pyx
|
|
@@ -151,7 +151,7 @@ cdef herr_t H5FD_fileobj_set_eoa(H5FD_fileobj_t *f, H5FD_mem_t type, haddr_t add
|
|
f.eoa = addr
|
|
return 0
|
|
|
|
-cdef haddr_t H5FD_fileobj_get_eof(const H5FD_fileobj_t *f, H5FD_mem_t type) noexcept with gil: # HADDR_UNDEF
|
|
+cdef haddr_t H5FD_fileobj_get_eof(const H5FD_fileobj_t *f, H5FD_mem_t type) except -1 with gil: # HADDR_UNDEF
|
|
(<object>f.fileobj).seek(0, libc.stdio.SEEK_END)
|
|
return (<object>f.fileobj).tell()
|
|
|
|
@@ -197,7 +197,7 @@ ctypedef herr_t (*file_free_func_ptr)(void *) except -1
|
|
ctypedef herr_t (*file_close_func_ptr)(H5FD_t *) except -1
|
|
ctypedef haddr_t (*file_get_eoa_func_ptr)(const H5FD_t *, H5FD_mem_t) noexcept
|
|
ctypedef herr_t (*file_set_eof_func_ptr)(H5FD_t *, H5FD_mem_t, haddr_t) noexcept
|
|
-ctypedef haddr_t (*file_get_eof_func_ptr)(const H5FD_t *, H5FD_mem_t) noexcept
|
|
+ctypedef haddr_t (*file_get_eof_func_ptr)(const H5FD_t *, H5FD_mem_t) except -1
|
|
ctypedef herr_t (*file_read_func_ptr)(H5FD_t *, H5FD_mem_t, hid_t, haddr_t, size_t, void*) except -1
|
|
ctypedef herr_t (*file_write_func_ptr)(H5FD_t *, H5FD_mem_t, hid_t, haddr_t, size_t, const void*) except -1
|
|
ctypedef herr_t (*file_truncate_func_ptr)(H5FD_t *, hid_t, hbool_t) except -1
|
|
--
|
|
2.27.0
|
|
|