Skip to content

Commit 4048684

Browse files
check error helpers: rename *_check => check_*
1 parent 0018f2e commit 4048684

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/Tar.jl

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function create(
7474
dir::AbstractString,
7575
tarball::Union{AbstractString, IO, Nothing} = nothing,
7676
)
77-
create_dir_check(dir)
77+
check_create_dir(dir)
7878
open_write(tarball) do tar
7979
create_tarball(predicate, tar, dir)
8080
end
@@ -141,8 +141,8 @@ function extract(
141141
tarball::Union{AbstractString, IO},
142142
dir::Union{AbstractString, Nothing} = nothing,
143143
)
144-
extract_tarball_check(tarball)
145-
extract_dir_check(dir)
144+
check_extract_tarball(tarball)
145+
check_extract_dir(dir)
146146
open_read(tarball) do tar
147147
if dir !== nothing && ispath(dir)
148148
extract_tarball(predicate, tar, dir)
@@ -198,7 +198,7 @@ function rewrite(
198198
old_tarball::Union{AbstractString, IO},
199199
new_tarball::Union{AbstractString, IO, Nothing} = nothing,
200200
)
201-
old_tarball = rewrite_old_tarball_check(old_tarball)
201+
old_tarball = check_rewrite_old_tarball(old_tarball)
202202
open_read(old_tarball) do old_tar
203203
open_write(new_tarball) do new_tar
204204
rewrite_tarball(predicate, old_tar, new_tar)
@@ -274,7 +274,7 @@ function tree_hash(
274274
algorithm == "git-sha256" ? SHA.SHA256_CTX :
275275
error("invalid tree hashing algorithm: $algorithm")
276276

277-
tree_hash_tarball_check(tarball)
277+
check_tree_hash_tarball(tarball)
278278
open_read(tarball) do tar
279279
git_tree_hash(predicate, tar, HashType, skip_empty)
280280
end
@@ -295,27 +295,27 @@ end
295295

296296
## error checking utility functions
297297

298-
create_dir_check(dir::AbstractString) =
298+
check_create_dir(dir::AbstractString) =
299299
isdir(dir) || error("""
300300
not a directory: $dir
301301
USAGE: create([predicate,] dir, [tarball])
302302
""")
303303

304-
list_tarball_check(tarball::AbstractString) =
304+
check_list_tarball(tarball::AbstractString) =
305305
isfile(tarball) || error("""
306306
not a file: $tarball
307307
USAGE: list(tarball)
308308
""")
309309

310-
extract_tarball_check(tarball::AbstractString) =
310+
check_extract_tarball(tarball::AbstractString) =
311311
isfile(tarball) || error("""
312312
not a file: $tarball
313313
USAGE: extract([predicate,] tarball, [dir])
314314
""")
315315

316-
extract_tarball_check(tarball::IO) = nothing
316+
check_extract_tarball(tarball::IO) = nothing
317317

318-
function extract_dir_check(dir::AbstractString)
318+
function check_extract_dir(dir::AbstractString)
319319
st = stat(dir)
320320
ispath(st) && !isdir(st) &&
321321
error("""
@@ -329,23 +329,23 @@ function extract_dir_check(dir::AbstractString)
329329
""")
330330
end
331331

332-
extract_dir_check(dir::Nothing) = nothing
332+
check_extract_dir(dir::Nothing) = nothing
333333

334-
rewrite_old_tarball_check(tarball::AbstractString) =
334+
check_rewrite_old_tarball(tarball::AbstractString) =
335335
isfile(tarball) ? tarball : rror("""
336336
not a file: $tarball
337337
USAGE: rewrite([predicate,] old_tarball, [new_tarball])
338338
""")
339339

340-
rewrite_old_tarball_check(tarball::IO) =
340+
check_rewrite_old_tarball(tarball::IO) =
341341
applicable(seek, tarball, 0) ? tarball : IOBuffer(read(tarball))
342342

343-
tree_hash_tarball_check(tarball::AbstractString) =
343+
check_tree_hash_tarball(tarball::AbstractString) =
344344
isfile(tarball) || error("""
345345
not a file: $tarball
346346
USAGE: tree_hash([predicate,] tarball)
347347
""")
348348

349-
tree_hash_tarball_check(tarball::IO) = nothing
349+
check_tree_hash_tarball(tarball::IO) = nothing
350350

351351
end # module

0 commit comments

Comments
 (0)