diff options
| author | Ron Yorston <rmy@pobox.com> | 2025-05-19 08:34:32 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2025-05-19 08:34:32 +0100 |
| commit | 64bf69893bd99c305d13a956389f216e7d15c682 (patch) | |
| tree | 7fa7d449f0633c86c1248c0bb86363dd9f46da38 /include | |
| parent | a807cdfa95cf4af2f84e207ed15887cc3514cb43 (diff) | |
| parent | 5f07327251c93184dfcfc8d978fc35705930ec53 (diff) | |
| download | busybox-w32-64bf69893bd99c305d13a956389f216e7d15c682.tar.gz busybox-w32-64bf69893bd99c305d13a956389f216e7d15c682.tar.bz2 busybox-w32-64bf69893bd99c305d13a956389f216e7d15c682.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/libbb.h b/include/libbb.h index bc1453e12..7357d2907 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -1071,13 +1071,13 @@ unsigned bb_clk_tck(void) FAST_FUNC; | |||
| 1071 | 1071 | ||
| 1072 | #if SEAMLESS_COMPRESSION | 1072 | #if SEAMLESS_COMPRESSION |
| 1073 | /* Autodetects gzip/bzip2 formats. fd may be in the middle of the file! */ | 1073 | /* Autodetects gzip/bzip2 formats. fd may be in the middle of the file! */ |
| 1074 | int setup_unzip_on_fd(int fd, int fail_if_not_compressed) FAST_FUNC; | 1074 | int setup_unzip_on_fd(int fd, int die_if_not_compressed) FAST_FUNC; |
| 1075 | /* Autodetects .gz etc */ | 1075 | /* Autodetects .gz etc */ |
| 1076 | extern int open_zipped(const char *fname, int fail_if_not_compressed) FAST_FUNC; | 1076 | extern int open_zipped(const char *fname, int die_if_not_compressed) FAST_FUNC; |
| 1077 | extern void *xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; | 1077 | extern void *xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; |
| 1078 | #else | 1078 | #else |
| 1079 | # define setup_unzip_on_fd(...) (0) | 1079 | # define setup_unzip_on_fd(...) (0) |
| 1080 | # define open_zipped(fname, fail_if_not_compressed) open((fname), O_RDONLY); | 1080 | # define open_zipped(fname, die_if_not_compressed) open((fname), O_RDONLY); |
| 1081 | # define xmalloc_open_zipped_read_close(fname, maxsz_p) xmalloc_open_read_close((fname), (maxsz_p)) | 1081 | # define xmalloc_open_zipped_read_close(fname, maxsz_p) xmalloc_open_read_close((fname), (maxsz_p)) |
| 1082 | #endif | 1082 | #endif |
| 1083 | /* lzma has no signature, need a little helper. NB: exist only for ENABLE_FEATURE_SEAMLESS_LZMA=y */ | 1083 | /* lzma has no signature, need a little helper. NB: exist only for ENABLE_FEATURE_SEAMLESS_LZMA=y */ |