Skip to content

Commit 6d66794

Browse files
committed
more fixes
1 parent 6c2ff75 commit 6d66794

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

src/HDF5.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,9 +1386,9 @@ function read(obj::DatasetOrAttribute, ::Type{Array{S}}) where {S<:String}
13861386
readarray(obj, memtype_id, buf)
13871387
src = 1
13881388
for i = 1:len
1389-
slen = findnext(buf, 0x00, src) - src # find null terminator
1389+
slen = coalesce(findnext(isequal(0x00), buf, src), 0) - src # find null terminator
13901390
sv = StringVector(slen)
1391-
copy!(sv, 1, buf, src, slen)
1391+
copyto!(sv, 1, buf, src, slen)
13921392
ret[i] = String(sv)
13931393
src += ilen
13941394
end
@@ -1804,7 +1804,7 @@ d_create_external(parent::Union{HDF5File, HDF5Group}, name::String, filepath::St
18041804

18051805
function do_write_chunk(dataset::HDF5Dataset, offset, chunk_bytes::Vector{UInt8}, filter_mask=0)
18061806
checkvalid(dataset)
1807-
offs = collect(Hsize, reverse(offset))-1
1807+
offs = collect(Hsize, reverse(offset)) .- 1
18081808
h5do_write_chunk(dataset, H5P_DEFAULT, UInt32(filter_mask), offs, length(chunk_bytes), chunk_bytes)
18091809
end
18101810

src/datafile.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ read(f::Base.Callable, parent::DataFile, name::String...) =
4040
# Read every variable in the file
4141
function read(f::DataFile)
4242
vars = names(f)
43-
vals = Vector{Any}(length(vars))
43+
vals = Vector{Any}(undef,length(vars))
4444
for i = 1:length(vars)
4545
vals[i] = read(f, vars[i])
4646
end

test/gc.jl

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
using HDF5
22
using Compat.Test
3+
import Compat.GC
34

45
macro gcvalid(args...)
56
Expr(:block, quote
6-
gc_enable(true)
7-
gc()
8-
gc_enable(false)
7+
GC.enable(true)
8+
GC.gc()
9+
GC.enable(false)
910
end,
1011
[:(@test HDF5.isvalid($(esc(x)))) for x in args]...)
1112
end
@@ -23,7 +24,7 @@ end
2324

2425
@testset "gc" begin
2526

26-
gc_enable(false)
27+
GC.enable(false)
2728
fn = tempname()
2829
for i = 1:10
2930
file = h5open(fn, "w")
@@ -62,7 +63,7 @@ for i = 1:10
6263
@gcvalid dt ds d g a
6364
close(file)
6465
end
65-
gc_enable(true)
66+
GC.enable(true)
6667
rm(fn)
6768

6869
end # testset gc

test/readremote.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using HDF5
22
using Compat.Test
3+
using Compat.LinearAlgebra: norm
34

45
@testset "readremote" begin
56

0 commit comments

Comments
 (0)