diff options
| author | Mark Whitley <markw@lineo.com> | 2001-03-07 17:42:07 +0000 |
|---|---|---|
| committer | Mark Whitley <markw@lineo.com> | 2001-03-07 17:42:07 +0000 |
| commit | ae5612ca6e74ba251cd10fc853dcf9694c0fecf1 (patch) | |
| tree | ba3e50459f4b4ae476ce19e797c68c5e6de055e0 /ls.c | |
| parent | ae20128e9f7a7d31629079068b04cf7119cc40df (diff) | |
| download | busybox-w32-ae5612ca6e74ba251cd10fc853dcf9694c0fecf1.tar.gz busybox-w32-ae5612ca6e74ba251cd10fc853dcf9694c0fecf1.tar.bz2 busybox-w32-ae5612ca6e74ba251cd10fc853dcf9694c0fecf1.zip | |
Some minor cleanups to df.c. Also, with Erik's blessing, changed name of
'format' function to 'make_human_readable_str'.
Diffstat (limited to 'ls.c')
| -rw-r--r-- | ls.c | 6 |
1 files changed, 4 insertions, 2 deletions
| @@ -610,7 +610,8 @@ int list_single(struct dnode *dn) | |||
| 610 | break; | 610 | break; |
| 611 | case LIST_BLOCKS: | 611 | case LIST_BLOCKS: |
| 612 | #ifdef BB_FEATURE_HUMAN_READABLE | 612 | #ifdef BB_FEATURE_HUMAN_READABLE |
| 613 | fprintf(stdout, "%5s ", format(dn->dstat.st_blocks>>1, (ls_disp_hr==TRUE)? 0: 1)); | 613 | fprintf(stdout, "%5s ", make_human_readable_str(dn->dstat.st_blocks>>1, |
| 614 | (ls_disp_hr==TRUE)? 0: 1)); | ||
| 614 | #else | 615 | #else |
| 615 | #if _FILE_OFFSET_BITS == 64 | 616 | #if _FILE_OFFSET_BITS == 64 |
| 616 | printf("%4lld ", dn->dstat.st_blocks>>1); | 617 | printf("%4lld ", dn->dstat.st_blocks>>1); |
| @@ -647,7 +648,8 @@ int list_single(struct dnode *dn) | |||
| 647 | printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev)); | 648 | printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev)); |
| 648 | } else { | 649 | } else { |
| 649 | #ifdef BB_FEATURE_HUMAN_READABLE | 650 | #ifdef BB_FEATURE_HUMAN_READABLE |
| 650 | fprintf(stdout, "%9s ", format(dn->dstat.st_size, (ls_disp_hr==TRUE)? 0: 1)); | 651 | fprintf(stdout, "%9s ", make_human_readable_str(dn->dstat.st_size, |
| 652 | (ls_disp_hr==TRUE)? 0: 1)); | ||
| 651 | #else | 653 | #else |
| 652 | #if _FILE_OFFSET_BITS == 64 | 654 | #if _FILE_OFFSET_BITS == 64 |
| 653 | printf("%9lld ", dn->dstat.st_size>>1); | 655 | printf("%9lld ", dn->dstat.st_size>>1); |