From 1b535dfd762e2c2bf13e02c8709bb9b8075a0966 Mon Sep 17 00:00:00 2001 From: Mus Date: Mon, 22 Apr 2019 23:56:14 -0400 Subject: [PATCH 1/4] Style fixes --- src/HDF5.jl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/HDF5.jl b/src/HDF5.jl index 55c98e274..4aed1ab3f 100644 --- a/src/HDF5.jl +++ b/src/HDF5.jl @@ -1328,15 +1328,15 @@ function read(obj::DatasetOrAttribute, ::Type{A}) where {A<:FixedArray} end function read(obj::DatasetOrAttribute, ::Type{Array{A}}) where {A<:FixedArray} T = eltype(A) - if !(T<:HDF5Scalar) + if !(T <: HDF5Scalar) error("Sorry, not yet supported") end sz = size(A) dims = size(obj) data = Array{T}(undef,sz..., dims...) nd = length(sz) - hsz = Hsize[convert(Hsize,sz[nd-i+1]) for i = 1:nd] - memtype_id = h5t_array_create(hdf5_type_id(T), convert(Cuint, length(sz)), hsz) + hsz = Hsize[sz[nd-i+1] for i = 1:nd] + memtype_id = h5t_array_create(hdf5_type_id(T), length(sz), hsz) try h5d_read(obj.id, memtype_id, H5S_ALL, H5S_ALL, obj.xfer, data) finally @@ -1601,15 +1601,15 @@ function readmmap(obj::HDF5Dataset, ::Type{Array{T}}) where {T} local fd prop = h5d_get_access_plist(checkvalid(obj).id) try - ret = Ptr{Cint}[0] + ret = Ref{Ptr{CVoid}}() h5f_get_vfd_handle(obj.file.id, prop, ret) - fd = unsafe_load(ret[1]) + fd = unsafe_load(ret[]) finally HDF5.h5p_close(prop) end offset = h5d_get_offset(obj.id) - if offset == reinterpret(Hsize, convert(Hssize, -1)) + if offset == -1 error("Error mmapping array") end if offset % Base.datatype_alignment(T) == 0 @@ -2530,7 +2530,7 @@ function __init__() rehash!(hdf5_obj_open, length(hdf5_obj_open.keys)) - nothing + return nothing end end # module From ed6516b1557ca1d252bc84c7ef0fdac83b0ab6b5 Mon Sep 17 00:00:00 2001 From: Mus Date: Mon, 22 Apr 2019 23:58:33 -0400 Subject: [PATCH 2/4] M --- src/HDF5.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/HDF5.jl b/src/HDF5.jl index 4aed1ab3f..7f39d8ce7 100644 --- a/src/HDF5.jl +++ b/src/HDF5.jl @@ -43,7 +43,7 @@ end function init_libhdf5() status = ccall((:H5open, libhdf5), Cint, ()) status < 0 && error("Can't initialize the HDF5 library") - nothing + return nothing end function h5_get_libversion() @@ -1601,7 +1601,7 @@ function readmmap(obj::HDF5Dataset, ::Type{Array{T}}) where {T} local fd prop = h5d_get_access_plist(checkvalid(obj).id) try - ret = Ref{Ptr{CVoid}}() + ret = Ref{Ptr{Cint}}() h5f_get_vfd_handle(obj.file.id, prop, ret) fd = unsafe_load(ret[]) finally From d0306b9d00b68e70961486505bd79eecdb42704b Mon Sep 17 00:00:00 2001 From: Mustafa M Date: Tue, 23 Apr 2019 09:53:24 -0400 Subject: [PATCH 3/4] Update HDF5.jl --- src/HDF5.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HDF5.jl b/src/HDF5.jl index 3a38a2c92..0a23724b9 100644 --- a/src/HDF5.jl +++ b/src/HDF5.jl @@ -1604,7 +1604,7 @@ function readmmap(obj::HDF5Dataset, ::Type{Array{T}}) where {T} try ret = Ref{Ptr{Cint}}() h5f_get_vfd_handle(obj.file.id, prop, ret) - fd = unsafe_load(ret[]) + fdint = unsafe_load(ret[]) finally HDF5.h5p_close(prop) end From a9bbef6b248c15a977d9b7b60858b3d36cd32362 Mon Sep 17 00:00:00 2001 From: Mustafa M Date: Tue, 23 Apr 2019 10:08:19 -0400 Subject: [PATCH 4/4] Update HDF5.jl --- src/HDF5.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/HDF5.jl b/src/HDF5.jl index 0a23724b9..255022455 100644 --- a/src/HDF5.jl +++ b/src/HDF5.jl @@ -1602,9 +1602,9 @@ function readmmap(obj::HDF5Dataset, ::Type{Array{T}}) where {T} local fdint prop = h5d_get_access_plist(checkvalid(obj).id) try - ret = Ref{Ptr{Cint}}() - h5f_get_vfd_handle(obj.file.id, prop, ret) - fdint = unsafe_load(ret[]) + ret = Ref{Ptr{Cint}}() + h5f_get_vfd_handle(obj.file.id, prop, ret) + fdint = unsafe_load(ret[]) finally HDF5.h5p_close(prop) end