Added c_calloc and c_realloc and updated docs accordingly.

halleysfifthinc · Jan 24, 2014 · b0359a5 · b0359a5
1 parent c9447ac
commit b0359a5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/base/exports.jl b/base/exports.jl
@@ -1223,6 +1223,8 @@ export
 # C interface
  c_free,
  c_malloc,
+ c_calloc,
+ c_realloc,
  cfunction,
  cglobal,
  disable_sigint,

diff --git a/base/libc.jl b/base/libc.jl
@@ -80,3 +80,5 @@ end
 
 c_free(p::Ptr) = ccall(:free, Void, (Ptr{Void},), p)
 c_malloc(size::Integer) = ccall(:malloc, Ptr{Void}, (Csize_t,), size)
+c_realloc(p::Ptr, size::Integer) = ccall(:realloc, Ptr{Void}, (Ptr{Void}, Csize_t), p, size)
+c_calloc(num::Integer, size::Integer) = ccall(:calloc, Ptr{Void}, (Csize_t, Csize_t), num, size)
diff --git a/doc/helpdb.jl b/doc/helpdb.jl
@@ -7057,6 +7057,18 @@ popdisplay(d::Display)
 
 "),
 
+("C Interface","Base","c_calloc","c_calloc(num::Integer, size::Integer)
+
+ Call \"calloc\" from the C standard library.
+
+"),
+
+("C Interface","Base","c_realloc","c_realloc(addr::Ptr, size::Integer)
+
+ Call \"realloc\" from the C standard library.
+
+"),
+
 ("C Interface","Base","c_free","c_free(addr::Ptr)
 
  Call \"free\" from the C standard library.

diff --git a/doc/stdlib/base.rst b/doc/stdlib/base.rst
@@ -4844,10 +4844,18 @@ C Interface
 
  Close shared library referenced by handle.
 
-.. function:: c_malloc(size::Integer)
+.. function:: c_malloc(size::Integer) -> Ptr{Void}
 
  Call ``malloc`` from the C standard library.
 
+.. function:: c_calloc(num::Integer, size::Integer) -> Ptr{Void}
+
+ Call ``calloc`` from the C standard library.
+
+.. function:: c_realloc(addr::Ptr, size::Integer) -> Ptr{Void}
+
+ Call ``realloc`` from the C standard library.
+
 .. function:: c_free(addr::Ptr)
 
  Call ``free`` from the C standard library.