diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-10 17:43:01 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-10 17:43:01 +0000 |
| commit | b6052724ffc9d45894147b70e7aff226938bd2d3 (patch) | |
| tree | e39d062e16d85da315cdb8cc0a96a03f15c10a23 /include | |
| parent | 0e2c93fc0b5f335d731ff712ce8f42d8616f05b9 (diff) | |
| download | busybox-w32-b6052724ffc9d45894147b70e7aff226938bd2d3.tar.gz busybox-w32-b6052724ffc9d45894147b70e7aff226938bd2d3.tar.bz2 busybox-w32-b6052724ffc9d45894147b70e7aff226938bd2d3.zip | |
open_transformer: do not return fd, it does not change
libbb: adopt zipped read from modprobe-small
function old new delta
getoptscmd 708 713 +5
qgravechar 106 109 +3
huft_build 1165 1168 +3
tr_main 474 472 -2
open_transformer 91 89 -2
evalvar 1376 1374 -2
rpm_main 1691 1688 -3
qrealloc 36 33 -3
get_header_tar_lzma 55 52 -3
get_header_tar_gz 100 97 -3
get_header_tar_bz2 55 52 -3
get_header_tar_Z 89 86 -3
find_main 418 406 -12
prepare 302 283 -19
xmalloc_open_zipped_read_close 161 135 -26
xmalloc_read 248 199 -49
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/13 up/down: 11/-130) Total: -119 bytes
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 9 | ||||
| -rw-r--r-- | include/unarchive.h | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/libbb.h b/include/libbb.h index 2dfdded5b..671584b43 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -583,15 +583,18 @@ extern unsigned char xread_char(int fd) FAST_FUNC; | |||
| 583 | // Reads one line a-la fgets (but doesn't save terminating '\n'). | 583 | // Reads one line a-la fgets (but doesn't save terminating '\n'). |
| 584 | // Uses single full_read() call, works only on seekable streams. | 584 | // Uses single full_read() call, works only on seekable streams. |
| 585 | extern char *reads(int fd, char *buf, size_t count) FAST_FUNC; | 585 | extern char *reads(int fd, char *buf, size_t count) FAST_FUNC; |
| 586 | extern ssize_t read_close(int fd, void *buf, size_t maxsz) FAST_FUNC; | ||
| 587 | extern ssize_t open_read_close(const char *filename, void *buf, size_t maxsz) FAST_FUNC; | ||
| 586 | // Reads one line a-la fgets (but doesn't save terminating '\n'). | 588 | // Reads one line a-la fgets (but doesn't save terminating '\n'). |
| 587 | // Reads byte-by-byte. Useful when it is important to not read ahead. | 589 | // Reads byte-by-byte. Useful when it is important to not read ahead. |
| 588 | // Bytes are appended to pfx (which must be malloced, or NULL). | 590 | // Bytes are appended to pfx (which must be malloced, or NULL). |
| 589 | extern char *xmalloc_reads(int fd, char *pfx, size_t *maxsz_p) FAST_FUNC; | 591 | extern char *xmalloc_reads(int fd, char *pfx, size_t *maxsz_p) FAST_FUNC; |
| 590 | extern ssize_t read_close(int fd, void *buf, size_t maxsz) FAST_FUNC; | 592 | /* Reads block up to *maxsz_p (default: MAX_INT(ssize_t)) */ |
| 591 | extern ssize_t open_read_close(const char *filename, void *buf, size_t maxsz) FAST_FUNC; | 593 | extern void *xmalloc_read(int fd, size_t *maxsz_p) FAST_FUNC; |
| 592 | extern void *xmalloc_read(int fd, size_t *sizep) FAST_FUNC; | ||
| 593 | /* Returns NULL if file can't be opened */ | 594 | /* Returns NULL if file can't be opened */ |
| 594 | extern void *xmalloc_open_read_close(const char *filename, size_t *maxsz_p) FAST_FUNC; | 595 | extern void *xmalloc_open_read_close(const char *filename, size_t *maxsz_p) FAST_FUNC; |
| 596 | /* Autodetects .gz etc */ | ||
| 597 | extern void *xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p) FAST_FUNC; | ||
| 595 | /* Never returns NULL */ | 598 | /* Never returns NULL */ |
| 596 | extern void *xmalloc_xopen_read_close(const char *filename, size_t *maxsz_p) FAST_FUNC; | 599 | extern void *xmalloc_xopen_read_close(const char *filename, size_t *maxsz_p) FAST_FUNC; |
| 597 | 600 | ||
diff --git a/include/unarchive.h b/include/unarchive.h index 1fab570c3..0e380db08 100644 --- a/include/unarchive.h +++ b/include/unarchive.h | |||
| @@ -126,12 +126,12 @@ extern USE_DESKTOP(long long) int unpack_gz_stream(int src_fd, int dst_fd) FAST_ | |||
| 126 | extern USE_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd) FAST_FUNC; | 126 | extern USE_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd) FAST_FUNC; |
| 127 | 127 | ||
| 128 | #if BB_MMU | 128 | #if BB_MMU |
| 129 | extern int open_transformer(int src_fd, | 129 | extern void open_transformer(int fd, |
| 130 | USE_DESKTOP(long long) int FAST_FUNC (*transformer)(int src_fd, int dst_fd)) FAST_FUNC; | 130 | USE_DESKTOP(long long) int FAST_FUNC (*transformer)(int src_fd, int dst_fd)) FAST_FUNC; |
| 131 | #define open_transformer(src_fd, transformer, transform_prog) open_transformer(src_fd, transformer) | 131 | #define open_transformer(fd, transformer, transform_prog) open_transformer(fd, transformer) |
| 132 | #else | 132 | #else |
| 133 | extern int open_transformer(int src_fd, const char *transform_prog) FAST_FUNC; | 133 | extern int open_transformer(int src_fd, const char *transform_prog) FAST_FUNC; |
| 134 | #define open_transformer(src_fd, transformer, transform_prog) open_transformer(src_fd, transform_prog) | 134 | #define open_transformer(fd, transformer, transform_prog) open_transformer(fd, transform_prog) |
| 135 | #endif | 135 | #endif |
| 136 | 136 | ||
| 137 | #if __GNUC_PREREQ(4,1) | 137 | #if __GNUC_PREREQ(4,1) |