emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

od: code shrink

Browse Source 
function                                             old     new   delta
od_main                                             2147    2132     -15

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-05-21 19:15:55 +02:00
parent d373355bf8
commit b808614785
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
coreutils/od_bloaty.c
View File

@ -546,7 +546,6 @@ decode_one_format(const char *s_orig, const char *s, struct tspec *tspec)
unsigned field_width = 0; unsigned field_width = 0;
int pos; int pos;
switch (*s) { switch (*s) {
case 'd': case 'd':
case 'o': case 'o':
@ -916,9 +915,9 @@ write_block(off_t current_offset, size_t n_bytes,
(*spec[i].print_function) (n_bytes, curr_block, spec[i].fmt_string); (*spec[i].print_function) (n_bytes, curr_block, spec[i].fmt_string);
if (spec[i].hexl_mode_trailer) { if (spec[i].hexl_mode_trailer) {
/* space-pad out to full line width, then dump the trailer */ /* space-pad out to full line width, then dump the trailer */
int datum_width = width_bytes[spec[i].size]; unsigned datum_width = width_bytes[spec[i].size];
int blank_fields = (bytes_per_block - n_bytes) / datum_width; unsigned blank_fields = (bytes_per_block - n_bytes) / datum_width;
int field_width = spec[i].field_width + 1; unsigned field_width = spec[i].field_width + 1;
printf("%*s", blank_fields * field_width, ""); printf("%*s", blank_fields * field_width, "");
dump_hexl_mode_trailer(n_bytes, curr_block); dump_hexl_mode_trailer(n_bytes, curr_block);
} }
@ -983,7 +982,7 @@ dump(off_t current_offset, off_t end_offset)
int idx; int idx;
size_t n_bytes_read; size_t n_bytes_read;
block[0] = xmalloc(2*bytes_per_block); block[0] = xmalloc(2 * bytes_per_block);
block[1] = block[0] + bytes_per_block; block[1] = block[0] + bytes_per_block;
idx = 0; idx = 0;
@ -994,16 +993,14 @@ dump(off_t current_offset, off_t end_offset)
n_bytes_read = 0; n_bytes_read = 0;
break; break;
} }
n_needed = MIN(end_offset - current_offset, n_needed = MIN(end_offset - current_offset, (off_t) bytes_per_block);
(off_t) bytes_per_block);
read_block(n_needed, block[idx], &n_bytes_read); read_block(n_needed, block[idx], &n_bytes_read);
if (n_bytes_read < bytes_per_block) if (n_bytes_read < bytes_per_block)
break; break;
assert(n_bytes_read == bytes_per_block); assert(n_bytes_read == bytes_per_block);
write_block(current_offset, n_bytes_read, write_block(current_offset, n_bytes_read, block[idx ^ 1], block[idx]);
block[!idx], block[idx]);
current_offset += n_bytes_read; current_offset += n_bytes_read;
idx = !idx; idx ^= 1;
} }
} else { } else {
while (1) { while (1) {
@ -1011,10 +1008,9 @@ dump(off_t current_offset, off_t end_offset)
if (n_bytes_read < bytes_per_block) if (n_bytes_read < bytes_per_block)
break; break;
assert(n_bytes_read == bytes_per_block); assert(n_bytes_read == bytes_per_block);
write_block(current_offset, n_bytes_read, write_block(current_offset, n_bytes_read, block[idx ^ 1], block[idx]);
block[!idx], block[idx]);
current_offset += n_bytes_read; current_offset += n_bytes_read;
idx = !idx; idx ^= 1;
} }
} }
@ -1030,7 +1026,7 @@ dump(off_t current_offset, off_t end_offset)
memset(block[idx] + n_bytes_read, 0, bytes_to_write - n_bytes_read); memset(block[idx] + n_bytes_read, 0, bytes_to_write - n_bytes_read);
write_block(current_offset, bytes_to_write, write_block(current_offset, bytes_to_write,
block[!idx], block[idx]); block[idx ^ 1], block[idx]);
current_offset += n_bytes_read; current_offset += n_bytes_read;
} }