diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2013-01-14 15:57:44 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2013-01-14 15:57:44 +0100 |
commit | 60cb48ca50fcff24aa6c3927f51e4a508fa118f4 (patch) | |
tree | 493e30821f3d484b7395ce9d9e4be39ec9a43126 /archival | |
parent | b8173b603f57dcf918a67f1ec00763ab5f4e1cf8 (diff) | |
download | busybox-w32-60cb48ca50fcff24aa6c3927f51e4a508fa118f4.tar.gz busybox-w32-60cb48ca50fcff24aa6c3927f51e4a508fa118f4.tar.bz2 busybox-w32-60cb48ca50fcff24aa6c3927f51e4a508fa118f4.zip |
whitespace cleanup. no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r-- | archival/cpio.c | 30 | ||||
-rw-r--r-- | archival/libarchive/decompress_gunzip.c | 4 | ||||
-rw-r--r-- | archival/libarchive/decompress_uncompress.c | 4 | ||||
-rw-r--r-- | archival/libarchive/lzo1x_9x.c | 12 | ||||
-rw-r--r-- | archival/libarchive/lzo1x_c.c | 2 | ||||
-rw-r--r-- | archival/libarchive/lzo1x_d.c | 2 | ||||
-rw-r--r-- | archival/lzop.c | 8 |
7 files changed, 31 insertions, 31 deletions
diff --git a/archival/cpio.c b/archival/cpio.c index 98cc18fa0..699c6dbb7 100644 --- a/archival/cpio.c +++ b/archival/cpio.c | |||
@@ -253,24 +253,24 @@ static NOINLINE int cpio_o(void) | |||
253 | } | 253 | } |
254 | 254 | ||
255 | bytes += printf("070701" | 255 | bytes += printf("070701" |
256 | "%08X%08X%08X%08X%08X%08X%08X" | 256 | "%08X%08X%08X%08X%08X%08X%08X" |
257 | "%08X%08X%08X%08X" /* GNU cpio uses uppercase hex */ | 257 | "%08X%08X%08X%08X" /* GNU cpio uses uppercase hex */ |
258 | /* strlen+1: */ "%08X" | 258 | /* strlen+1: */ "%08X" |
259 | /* chksum: */ "00000000" /* (only for "070702" files) */ | 259 | /* chksum: */ "00000000" /* (only for "070702" files) */ |
260 | /* name,NUL: */ "%s%c", | 260 | /* name,NUL: */ "%s%c", |
261 | (unsigned)(uint32_t) st.st_ino, | 261 | (unsigned)(uint32_t) st.st_ino, |
262 | (unsigned)(uint32_t) st.st_mode, | 262 | (unsigned)(uint32_t) st.st_mode, |
263 | (unsigned)(uint32_t) st.st_uid, | 263 | (unsigned)(uint32_t) st.st_uid, |
264 | (unsigned)(uint32_t) st.st_gid, | 264 | (unsigned)(uint32_t) st.st_gid, |
265 | (unsigned)(uint32_t) st.st_nlink, | 265 | (unsigned)(uint32_t) st.st_nlink, |
266 | (unsigned)(uint32_t) st.st_mtime, | 266 | (unsigned)(uint32_t) st.st_mtime, |
267 | (unsigned)(uint32_t) st.st_size, | 267 | (unsigned)(uint32_t) st.st_size, |
268 | (unsigned)(uint32_t) major(st.st_dev), | 268 | (unsigned)(uint32_t) major(st.st_dev), |
269 | (unsigned)(uint32_t) minor(st.st_dev), | 269 | (unsigned)(uint32_t) minor(st.st_dev), |
270 | (unsigned)(uint32_t) major(st.st_rdev), | 270 | (unsigned)(uint32_t) major(st.st_rdev), |
271 | (unsigned)(uint32_t) minor(st.st_rdev), | 271 | (unsigned)(uint32_t) minor(st.st_rdev), |
272 | (unsigned)(strlen(name) + 1), | 272 | (unsigned)(strlen(name) + 1), |
273 | name, '\0'); | 273 | name, '\0'); |
274 | bytes = cpio_pad4(bytes); | 274 | bytes = cpio_pad4(bytes); |
275 | 275 | ||
276 | if (st.st_size) { | 276 | if (st.st_size) { |
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c index 2d5ab3eb3..4e6b138c3 100644 --- a/archival/libarchive/decompress_gunzip.c +++ b/archival/libarchive/decompress_gunzip.c | |||
@@ -293,8 +293,8 @@ static unsigned fill_bitbuffer(STATE_PARAM unsigned bitbuffer, unsigned *current | |||
293 | * m: maximum lookup bits, returns actual | 293 | * m: maximum lookup bits, returns actual |
294 | */ | 294 | */ |
295 | static int huft_build(const unsigned *b, const unsigned n, | 295 | static int huft_build(const unsigned *b, const unsigned n, |
296 | const unsigned s, const unsigned short *d, | 296 | const unsigned s, const unsigned short *d, |
297 | const unsigned char *e, huft_t **t, unsigned *m) | 297 | const unsigned char *e, huft_t **t, unsigned *m) |
298 | { | 298 | { |
299 | unsigned a; /* counter for codes of length k */ | 299 | unsigned a; /* counter for codes of length k */ |
300 | unsigned c[BMAX + 1]; /* bit length count table */ | 300 | unsigned c[BMAX + 1]; /* bit length count table */ |
diff --git a/archival/libarchive/decompress_uncompress.c b/archival/libarchive/decompress_uncompress.c index 3826a65ea..53c27080f 100644 --- a/archival/libarchive/decompress_uncompress.c +++ b/archival/libarchive/decompress_uncompress.c | |||
@@ -235,8 +235,8 @@ unpack_Z_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd) | |||
235 | p = &inbuf[posbits >> 3]; | 235 | p = &inbuf[posbits >> 3]; |
236 | bb_error_msg | 236 | bb_error_msg |
237 | ("insize:%d posbits:%d inbuf:%02X %02X %02X %02X %02X (%d)", | 237 | ("insize:%d posbits:%d inbuf:%02X %02X %02X %02X %02X (%d)", |
238 | insize, posbits, p[-1], p[0], p[1], p[2], p[3], | 238 | insize, posbits, p[-1], p[0], p[1], p[2], p[3], |
239 | (posbits & 07)); | 239 | (posbits & 07)); |
240 | */ | 240 | */ |
241 | bb_error_msg("corrupted data"); | 241 | bb_error_msg("corrupted data"); |
242 | goto err; | 242 | goto err; |
diff --git a/archival/libarchive/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c index 483205155..897132987 100644 --- a/archival/libarchive/lzo1x_9x.c +++ b/archival/libarchive/lzo1x_9x.c | |||
@@ -644,7 +644,7 @@ static int len_of_coded_match(unsigned m_len, unsigned m_off, unsigned lit) | |||
644 | 644 | ||
645 | 645 | ||
646 | static int min_gain(unsigned ahead, unsigned lit1, | 646 | static int min_gain(unsigned ahead, unsigned lit1, |
647 | unsigned lit2, int l1, int l2, int l3) | 647 | unsigned lit2, int l1, int l2, int l3) |
648 | { | 648 | { |
649 | int lazy_match_min_gain = 0; | 649 | int lazy_match_min_gain = 0; |
650 | 650 | ||
@@ -673,7 +673,7 @@ static int min_gain(unsigned ahead, unsigned lit1, | |||
673 | #if defined(SWD_BEST_OFF) | 673 | #if defined(SWD_BEST_OFF) |
674 | 674 | ||
675 | static void better_match(const lzo_swd_p swd, | 675 | static void better_match(const lzo_swd_p swd, |
676 | unsigned *m_len, unsigned *m_off) | 676 | unsigned *m_len, unsigned *m_off) |
677 | { | 677 | { |
678 | if (*m_len <= M2_MIN_LEN) | 678 | if (*m_len <= M2_MIN_LEN) |
679 | return; | 679 | return; |
@@ -914,8 +914,8 @@ int lzo1x_999_compress_level(const uint8_t *in, unsigned in_len, | |||
914 | 914 | ||
915 | compression_level -= 7; | 915 | compression_level -= 7; |
916 | return lzo1x_999_compress_internal(in, in_len, out, out_len, wrkmem, | 916 | return lzo1x_999_compress_internal(in, in_len, out, out_len, wrkmem, |
917 | c[compression_level].good_length, | 917 | c[compression_level].good_length, |
918 | c[compression_level].max_lazy, | 918 | c[compression_level].max_lazy, |
919 | c[compression_level].max_chain, | 919 | c[compression_level].max_chain, |
920 | c[compression_level].use_best_off); | 920 | c[compression_level].use_best_off); |
921 | } | 921 | } |
diff --git a/archival/libarchive/lzo1x_c.c b/archival/libarchive/lzo1x_c.c index cc86f74b1..8c77072ab 100644 --- a/archival/libarchive/lzo1x_c.c +++ b/archival/libarchive/lzo1x_c.c | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | The LZO library is distributed in the hope that it will be useful, | 16 | The LZO library is distributed in the hope that it will be useful, |
17 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 17 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
18 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 18 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
19 | GNU General Public License for more details. | 19 | GNU General Public License for more details. |
20 | 20 | ||
21 | You should have received a copy of the GNU General Public License | 21 | You should have received a copy of the GNU General Public License |
diff --git a/archival/libarchive/lzo1x_d.c b/archival/libarchive/lzo1x_d.c index 348a85510..9bc1270da 100644 --- a/archival/libarchive/lzo1x_d.c +++ b/archival/libarchive/lzo1x_d.c | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | The LZO library is distributed in the hope that it will be useful, | 16 | The LZO library is distributed in the hope that it will be useful, |
17 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 17 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
18 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 18 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
19 | GNU General Public License for more details. | 19 | GNU General Public License for more details. |
20 | 20 | ||
21 | You should have received a copy of the GNU General Public License | 21 | You should have received a copy of the GNU General Public License |
diff --git a/archival/lzop.c b/archival/lzop.c index ec4e784ed..56003d421 100644 --- a/archival/lzop.c +++ b/archival/lzop.c | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | This program is distributed in the hope that it will be useful, | 15 | This program is distributed in the hope that it will be useful, |
16 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 16 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
17 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 17 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
18 | GNU General Public License for more details. | 18 | GNU General Public License for more details. |
19 | 19 | ||
20 | You should have received a copy of the GNU General Public License | 20 | You should have received a copy of the GNU General Public License |
@@ -116,7 +116,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, | |||
116 | unsigned nl; | 116 | unsigned nl; |
117 | unsigned long o_m1_a = 0, o_m1_b = 0, o_m2 = 0, o_m3_a = 0, o_m3_b = 0; | 117 | unsigned long o_m1_a = 0, o_m1_b = 0, o_m2 = 0, o_m3_a = 0, o_m3_b = 0; |
118 | 118 | ||
119 | // LZO_UNUSED(wrkmem); | 119 | // LZO_UNUSED(wrkmem); |
120 | 120 | ||
121 | *out_len = 0; | 121 | *out_len = 0; |
122 | 122 | ||
@@ -346,8 +346,8 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, | |||
346 | return LZO_E_EOF_NOT_FOUND; | 346 | return LZO_E_EOF_NOT_FOUND; |
347 | 347 | ||
348 | eof_found: | 348 | eof_found: |
349 | // LZO_UNUSED(o_m1_a); LZO_UNUSED(o_m1_b); LZO_UNUSED(o_m2); | 349 | // LZO_UNUSED(o_m1_a); LZO_UNUSED(o_m1_b); LZO_UNUSED(o_m2); |
350 | // LZO_UNUSED(o_m3_a); LZO_UNUSED(o_m3_b); | 350 | // LZO_UNUSED(o_m3_a); LZO_UNUSED(o_m3_b); |
351 | *out_len = pd(op, out); | 351 | *out_len = pd(op, out); |
352 | return (ip == ip_end ? LZO_E_OK : | 352 | return (ip == ip_end ? LZO_E_OK : |
353 | (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); | 353 | (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); |