diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-04 17:54:17 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-04 17:54:17 +0100 |
commit | b57eee8beb35706d4358ff5fb2a6f806765685ab (patch) | |
tree | da077ca65a5796645bf80b91900ce626e8f86258 | |
parent | ded688c6f61c98f1bc1758dc559102c31c919d00 (diff) | |
download | busybox-w32-b57eee8beb35706d4358ff5fb2a6f806765685ab.tar.gz busybox-w32-b57eee8beb35706d4358ff5fb2a6f806765685ab.tar.bz2 busybox-w32-b57eee8beb35706d4358ff5fb2a6f806765685ab.zip |
libbb.h: remove two over-zealous RETURNS_MALLOC
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | include/libbb.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/libbb.h b/include/libbb.h index bcf604a3c..d973d14e2 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -334,7 +334,8 @@ DIR *warn_opendir(const char *path) FAST_FUNC; | |||
334 | /* UNUSED: char *xmalloc_realpath(const char *path) FAST_FUNC RETURNS_MALLOC; */ | 334 | /* UNUSED: char *xmalloc_realpath(const char *path) FAST_FUNC RETURNS_MALLOC; */ |
335 | char *xmalloc_readlink(const char *path) FAST_FUNC RETURNS_MALLOC; | 335 | char *xmalloc_readlink(const char *path) FAST_FUNC RETURNS_MALLOC; |
336 | char *xmalloc_readlink_or_warn(const char *path) FAST_FUNC RETURNS_MALLOC; | 336 | char *xmalloc_readlink_or_warn(const char *path) FAST_FUNC RETURNS_MALLOC; |
337 | char *xrealloc_getcwd_or_warn(char *cwd) FAST_FUNC RETURNS_MALLOC; | 337 | /* !RETURNS_MALLOC: it's a realloc-like function */ |
338 | char *xrealloc_getcwd_or_warn(char *cwd) FAST_FUNC; | ||
338 | 339 | ||
339 | char *xmalloc_follow_symlinks(const char *path) FAST_FUNC RETURNS_MALLOC; | 340 | char *xmalloc_follow_symlinks(const char *path) FAST_FUNC RETURNS_MALLOC; |
340 | 341 | ||
@@ -618,7 +619,7 @@ extern ssize_t open_read_close(const char *filename, void *buf, size_t maxsz) FA | |||
618 | // Reads one line a-la fgets (but doesn't save terminating '\n'). | 619 | // Reads one line a-la fgets (but doesn't save terminating '\n'). |
619 | // Reads byte-by-byte. Useful when it is important to not read ahead. | 620 | // Reads byte-by-byte. Useful when it is important to not read ahead. |
620 | // Bytes are appended to pfx (which must be malloced, or NULL). | 621 | // Bytes are appended to pfx (which must be malloced, or NULL). |
621 | extern char *xmalloc_reads(int fd, char *pfx, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; | 622 | extern char *xmalloc_reads(int fd, char *pfx, size_t *maxsz_p) FAST_FUNC; |
622 | /* Reads block up to *maxsz_p (default: INT_MAX - 4095) */ | 623 | /* Reads block up to *maxsz_p (default: INT_MAX - 4095) */ |
623 | extern void *xmalloc_read(int fd, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; | 624 | extern void *xmalloc_read(int fd, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; |
624 | /* Returns NULL if file can't be opened (default max size: INT_MAX - 4095) */ | 625 | /* Returns NULL if file can't be opened (default max size: INT_MAX - 4095) */ |