diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-02-03 15:59:46 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-02-03 15:59:46 +0100 |
| commit | e59e5ff96e9461dc658748509ec41408c140f6fb (patch) | |
| tree | f260acbcfa03ca2bcc57b4167a294cbea8cef73f | |
| parent | 9e5662ea74ce314104904729a092a0130db6c85b (diff) | |
| download | busybox-w32-e59e5ff96e9461dc658748509ec41408c140f6fb.tar.gz busybox-w32-e59e5ff96e9461dc658748509ec41408c140f6fb.tar.bz2 busybox-w32-e59e5ff96e9461dc658748509ec41408c140f6fb.zip | |
bzip2: reduce indentation, no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | archival/libarchive/bz/compress.c | 89 |
1 files changed, 45 insertions, 44 deletions
diff --git a/archival/libarchive/bz/compress.c b/archival/libarchive/bz/compress.c index 6260fd94c..f1393242d 100644 --- a/archival/libarchive/bz/compress.c +++ b/archival/libarchive/bz/compress.c | |||
| @@ -216,56 +216,57 @@ void generateMTFValues(EState* s) | |||
| 216 | 216 | ||
| 217 | if (yy[0] == ll_i) { | 217 | if (yy[0] == ll_i) { |
| 218 | zPend++; | 218 | zPend++; |
| 219 | } else { | 219 | continue; |
| 220 | if (zPend > 0) { | 220 | } |
| 221 | |||
| 222 | if (zPend > 0) { | ||
| 221 | process_zPend: | 223 | process_zPend: |
| 222 | zPend--; | 224 | zPend--; |
| 223 | while (1) { | 225 | while (1) { |
| 224 | #if 0 | 226 | #if 0 |
| 225 | if (zPend & 1) { | 227 | if (zPend & 1) { |
| 226 | mtfv[wr] = BZ_RUNB; wr++; | 228 | mtfv[wr] = BZ_RUNB; wr++; |
| 227 | s->mtfFreq[BZ_RUNB]++; | 229 | s->mtfFreq[BZ_RUNB]++; |
| 228 | } else { | 230 | } else { |
| 229 | mtfv[wr] = BZ_RUNA; wr++; | 231 | mtfv[wr] = BZ_RUNA; wr++; |
| 230 | s->mtfFreq[BZ_RUNA]++; | 232 | s->mtfFreq[BZ_RUNA]++; |
| 231 | } | 233 | } |
| 232 | #else /* same as above, since BZ_RUNA is 0 and BZ_RUNB is 1 */ | 234 | #else /* same as above, since BZ_RUNA is 0 and BZ_RUNB is 1 */ |
| 233 | unsigned run = zPend & 1; | 235 | unsigned run = zPend & 1; |
| 234 | mtfv[wr] = run; | 236 | mtfv[wr] = run; |
| 235 | wr++; | 237 | wr++; |
| 236 | s->mtfFreq[run]++; | 238 | s->mtfFreq[run]++; |
| 237 | #endif | 239 | #endif |
| 238 | zPend -= 2; | 240 | zPend -= 2; |
| 239 | if (zPend < 0) | 241 | if (zPend < 0) |
| 240 | break; | 242 | break; |
| 241 | zPend = (unsigned)zPend / 2; | 243 | zPend = (unsigned)zPend / 2; |
| 242 | /* bbox: unsigned div is easier */ | 244 | /* bbox: unsigned div is easier */ |
| 243 | } | ||
| 244 | if (i < 0) /* came via "goto process_zPend"? exit */ | ||
| 245 | goto end; | ||
| 246 | zPend = 0; | ||
| 247 | } | 245 | } |
| 248 | { | 246 | if (i < 0) /* came via "goto process_zPend"? exit */ |
| 249 | register uint8_t rtmp; | 247 | goto end; |
| 250 | register uint8_t* ryy_j; | 248 | zPend = 0; |
| 251 | register uint8_t rll_i; | 249 | } |
| 252 | rtmp = yy[1]; | 250 | { |
| 253 | yy[1] = yy[0]; | 251 | register uint8_t rtmp; |
| 254 | ryy_j = &(yy[1]); | 252 | register uint8_t* ryy_j; |
| 255 | rll_i = ll_i; | 253 | register uint8_t rll_i; |
| 256 | while (rll_i != rtmp) { | 254 | rtmp = yy[1]; |
| 257 | register uint8_t rtmp2; | 255 | yy[1] = yy[0]; |
| 258 | ryy_j++; | 256 | ryy_j = &(yy[1]); |
| 259 | rtmp2 = rtmp; | 257 | rll_i = ll_i; |
| 260 | rtmp = *ryy_j; | 258 | while (rll_i != rtmp) { |
| 261 | *ryy_j = rtmp2; | 259 | register uint8_t rtmp2; |
| 262 | } | 260 | ryy_j++; |
| 263 | yy[0] = rtmp; | 261 | rtmp2 = rtmp; |
| 264 | j = ryy_j - &(yy[0]); | 262 | rtmp = *ryy_j; |
| 265 | mtfv[wr] = j+1; | 263 | *ryy_j = rtmp2; |
| 266 | wr++; | ||
| 267 | s->mtfFreq[j+1]++; | ||
| 268 | } | 264 | } |
| 265 | yy[0] = rtmp; | ||
| 266 | j = ryy_j - &(yy[0]); | ||
| 267 | mtfv[wr] = j+1; | ||
| 268 | wr++; | ||
| 269 | s->mtfFreq[j+1]++; | ||
| 269 | } | 270 | } |
| 270 | } | 271 | } |
| 271 | 272 | ||