aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-05-08 21:21:10 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2011-05-08 21:21:10 +0200
commit80c5b6893d4708b3683ad9a51c990a326a8f1dff (patch)
tree0c4c3192e77e6afa1a1d47e750a0840d3a4ca60e /include
parentb8709032a3fb57b3ec536bdf9b92b526ed63b995 (diff)
downloadbusybox-w32-80c5b6893d4708b3683ad9a51c990a326a8f1dff.tar.gz
busybox-w32-80c5b6893d4708b3683ad9a51c990a326a8f1dff.tar.bz2
busybox-w32-80c5b6893d4708b3683ad9a51c990a326a8f1dff.zip
libbb: nonblock_safe_read->nonblock_immune_read, remove unused param of xmalloc_reads
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
-rw-r--r--include/libbb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 34f7f6a8b..4ea94e77f 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -672,7 +672,7 @@ void* xrealloc_vector_helper(void *vector, unsigned sizeof_and_shift, int idx) F
672 672
673 673
674extern ssize_t safe_read(int fd, void *buf, size_t count) FAST_FUNC; 674extern ssize_t safe_read(int fd, void *buf, size_t count) FAST_FUNC;
675extern ssize_t nonblock_safe_read(int fd, void *buf, size_t count) FAST_FUNC; 675extern ssize_t nonblock_immune_read(int fd, void *buf, size_t count) FAST_FUNC;
676// NB: will return short read on error, not -1, 676// NB: will return short read on error, not -1,
677// if some data was read before error occurred 677// if some data was read before error occurred
678extern ssize_t full_read(int fd, void *buf, size_t count) FAST_FUNC; 678extern ssize_t full_read(int fd, void *buf, size_t count) FAST_FUNC;
@@ -683,7 +683,7 @@ extern ssize_t open_read_close(const char *filename, void *buf, size_t maxsz) FA
683// Reads one line a-la fgets (but doesn't save terminating '\n'). 683// Reads one line a-la fgets (but doesn't save terminating '\n').
684// Reads byte-by-byte. Useful when it is important to not read ahead. 684// Reads byte-by-byte. Useful when it is important to not read ahead.
685// Bytes are appended to pfx (which must be malloced, or NULL). 685// Bytes are appended to pfx (which must be malloced, or NULL).
686extern char *xmalloc_reads(int fd, char *pfx, size_t *maxsz_p) FAST_FUNC; 686extern char *xmalloc_reads(int fd, size_t *maxsz_p) FAST_FUNC;
687/* Reads block up to *maxsz_p (default: INT_MAX - 4095) */ 687/* Reads block up to *maxsz_p (default: INT_MAX - 4095) */
688extern void *xmalloc_read(int fd, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; 688extern void *xmalloc_read(int fd, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC;
689/* Returns NULL if file can't be opened (default max size: INT_MAX - 4095) */ 689/* Returns NULL if file can't be opened (default max size: INT_MAX - 4095) */