From 04a5c54e08eb68fd416a0dc2ee643946c6a4c9b5 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 9 Nov 2007 03:19:01 -0500 Subject: [PATCH] Remove redundant check-ptr usage --- core/libc/libc-docs.factor | 3 +-- core/libc/libc.factor | 2 +- extra/io/buffers/buffers.factor | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/libc/libc-docs.factor b/core/libc/libc-docs.factor index 9596b98292..ba870560d6 100644 --- a/core/libc/libc-docs.factor +++ b/core/libc/libc-docs.factor @@ -26,8 +26,7 @@ HELP: memcpy HELP: check-ptr { $values { "c-ptr" "an alien address, byte array, or " { $link f } } { "checked" "an alien address or byte array with non-zero address" } } -{ $description "Throws an error if the input is " { $link f } ". Otherwise the object remains on the data stack. This word should be used to check the return values of " { $link malloc } " and " { $link realloc } " before use." } -{ $error-description "Callers of " { $link malloc } " and " { $link realloc } " should use " { $link check-ptr } " to throw an error in the case of a memory allocation failure." } ; +{ $description "Throws an error if the input is " { $link f } ". Otherwise the object remains on the data stack." } ; HELP: free { $values { "alien" c-ptr } } diff --git a/core/libc/libc.factor b/core/libc/libc.factor index 71b49e940a..88c5070d1f 100644 --- a/core/libc/libc.factor +++ b/core/libc/libc.factor @@ -84,4 +84,4 @@ PRIVATE> "void" "libc" "memcpy" { "void*" "void*" "ulong" } alien-invoke ; : with-malloc ( size quot -- ) - swap 1 calloc check-ptr swap keep free ; inline + swap 1 calloc swap keep free ; inline diff --git a/extra/io/buffers/buffers.factor b/extra/io/buffers/buffers.factor index e58cf3ead0..5d6eaebe6f 100644 --- a/extra/io/buffers/buffers.factor +++ b/extra/io/buffers/buffers.factor @@ -79,7 +79,7 @@ HINTS: search-buffer-until { fixnum fixnum simple-alien string } ; buffer-fill zero? ; : extend-buffer ( n buffer -- ) - 2dup buffer-ptr swap realloc check-ptr + 2dup buffer-ptr swap realloc over set-buffer-ptr set-buffer-size ; : check-overflow ( n buffer -- )