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
 extern ssize_t safe_read(int fd, void *buf, size_t count) FAST_FUNC;
-extern ssize_t nonblock_safe_read(int fd, void *buf, size_t count) FAST_FUNC;
+extern ssize_t nonblock_immune_read(int fd, void *buf, size_t count) FAST_FUNC;
 // NB: will return short read on error, not -1,
 // if some data was read before error occurred
 extern 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
 // Reads one line a-la fgets (but doesn't save terminating '\n').
 // Reads byte-by-byte. Useful when it is important to not read ahead.
 // Bytes are appended to pfx (which must be malloced, or NULL).
-extern char *xmalloc_reads(int fd, char *pfx, size_t *maxsz_p) FAST_FUNC;
+extern char *xmalloc_reads(int fd, size_t *maxsz_p) FAST_FUNC;
 /* Reads block up to *maxsz_p (default: INT_MAX - 4095) */
 extern void *xmalloc_read(int fd, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC;
 /* Returns NULL if file can't be opened (default max size: INT_MAX - 4095) */

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
674	extern ssize_t safe_read(int fd, void *buf, size_t count) FAST_FUNC;	674	extern ssize_t safe_read(int fd, void *buf, size_t count) FAST_FUNC;
675	extern ssize_t nonblock_safe_read(int fd, void *buf, size_t count) FAST_FUNC;	675	extern 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
678	extern ssize_t full_read(int fd, void *buf, size_t count) FAST_FUNC;	678	extern 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).
686	extern char xmalloc_reads(int fd, char pfx, size_t *maxsz_p) FAST_FUNC;	686	extern 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) /
688	extern void xmalloc_read(int fd, size_t maxsz_p) FAST_FUNC RETURNS_MALLOC;	688	extern 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) */