diff options
| author | Denis Vlasenko | 2009-04-21 11:09:40 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2009-04-21 11:09:40 +0000 |
| commit | 5e34ff29bcc870936ab18172f438a34d042d4e03 (patch) | |
| tree | a5e7a528f2f916eb883f1161eadceacdf2dca4be /archival/bzip2.c | |
| parent | 8b814b4a349e2262c0ad25793b05206a14651ebb (diff) | |
| download | busybox-5e34ff29bcc870936ab18172f438a34d042d4e03.zip busybox-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.gz | |
*: mass renaming of USE_XXXX to IF_XXXX
and SKIP_XXXX to IF_NOT_XXXX - the second one was especially
badly named. It was not skipping anything!
Diffstat (limited to 'archival/bzip2.c')
| -rw-r--r-- | archival/bzip2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/archival/bzip2.c b/archival/bzip2.c index 8eb5ca9..bbaf566 100644 --- a/archival/bzip2.c +++ b/archival/bzip2.c @@ -64,7 +64,7 @@ static uint8_t level; * total written bytes so far otherwise */ static -USE_DESKTOP(long long) int bz_write(bz_stream *strm, void* rbuf, ssize_t rlen, void *wbuf) +IF_DESKTOP(long long) int bz_write(bz_stream *strm, void* rbuf, ssize_t rlen, void *wbuf) { int n, n2, ret; @@ -98,13 +98,13 @@ USE_DESKTOP(long long) int bz_write(bz_stream *strm, void* rbuf, ssize_t rlen, v if (rlen && strm->avail_in == 0) break; } - return 0 USE_DESKTOP( + strm->total_out ); + return 0 IF_DESKTOP( + strm->total_out ); } static -USE_DESKTOP(long long) int compressStream(unpack_info_t *info UNUSED_PARAM) +IF_DESKTOP(long long) int compressStream(unpack_info_t *info UNUSED_PARAM) { - USE_DESKTOP(long long) int total; + IF_DESKTOP(long long) int total; ssize_t count; bz_stream bzs; /* it's small */ #define strm (&bzs) @@ -163,7 +163,7 @@ int bzip2_main(int argc UNUSED_PARAM, char **argv) opt_complementary = "s2"; /* -s means -2 (compatibility) */ /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */ - opt = getopt32(argv, "cfv" USE_BUNZIP2("dt") "123456789qzs"); + opt = getopt32(argv, "cfv" IF_BUNZIP2("dt") "123456789qzs"); #if ENABLE_BUNZIP2 /* bunzip2_main may not be visible... */ if (opt & 0x18) // -d and/or -t return bunzip2_main(argc, argv); |