Remove custom version of ascii. Ref JuliaLang/julia#15773

yuyichao · Apr 11, 2016 · efc37c6 · efc37c6
1 parent d9c91cc
commit efc37c6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/handle.jl b/src/handle.jl
@@ -365,8 +365,8 @@ end
 
 "Returns the targeted architecture"
 function get_arch(hdl::Handle)
-    ptr_to_ascii(ccall((:alpm_option_get_arch, libalpm), Ptr{UInt8},
-                       (Ptr{Void},), hdl))
+    ascii(ccall((:alpm_option_get_arch, libalpm),
+                Ptr{UInt8}, (Ptr{Void},), hdl))
 end
 "Sets the targeted architecture"
 function set_arch(hdl::Handle, arch)

diff --git a/src/pkg.jl b/src/pkg.jl
@@ -234,8 +234,8 @@ get_db(pkg::Pkg) =
 
 "Returns the base64 encoded package signature"
 get_base64_sig(pkg::Pkg) =
-    ptr_to_ascii(ccall((:alpm_pkg_get_base64_sig, libalpm),
-                       Ptr{UInt8}, (Ptr{Void},), pkg))
+    ascii(ccall((:alpm_pkg_get_base64_sig, libalpm),
+                Ptr{UInt8}, (Ptr{Void},), pkg))
 
 "Returns the method used to validate a package during install"
 get_validation(pkg::Pkg) =

diff --git a/src/utils.jl b/src/utils.jl
@@ -13,10 +13,9 @@
 end
 
 @inline ptr_to_utf8(p::Ptr, own=false) = UTF8String(pchar_to_array(p, own))
-@inline ptr_to_ascii(p::Ptr, own=false) = ASCIIString(pchar_to_array(p, own))
 
 version() =
-    VersionNumber(ptr_to_ascii(ccall((:alpm_version, libalpm), Ptr{UInt8}, ())))
+    VersionNumber(ascii(ccall((:alpm_version, libalpm), Ptr{UInt8}, ())))
 capabilities() = ccall((:alpm_capabilities, libalpm), UInt32, ())
 
 # checksums