a407cf74c
Denys Vlasenko
2013-09-06
Subject
Make smart_ulltoa return pointer to end (allows for code shink in callers)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h +2 -2libbb/human_readable.c +4 -2procps/nmeter.c +1 -2procps/powertop.c +1 -2procps/ps.c +3 -6procps/top.c +1 -2util-linux/fdisk_gpt.c +2 -4
include/libbb.h+2 -2
| @@ -815,8 +815,8 @@ char *itoa(int n) FAST_FUNC; | |
| char *utoa_to_buf(unsigned n, char *buf, unsigned buflen) FAST_FUNC; | |
| char *itoa_to_buf(int n, char *buf, unsigned buflen) FAST_FUNC; | |
| /* Intelligent formatters of bignums */ | |
| - | void smart_ulltoa4(unsigned long long ul, char buf[4], const char *scale) FAST_FUNC; |
| - | void smart_ulltoa5(unsigned long long ul, char buf[5], const char *scale) FAST_FUNC; |
| + | char *smart_ulltoa4(unsigned long long ul, char buf[4], const char *scale) FAST_FUNC; |
| + | char *smart_ulltoa5(unsigned long long ul, char buf[5], const char *scale) FAST_FUNC; |
| /* If block_size == 0, display size without fractional part, | |
| * else display (size * block_size) with one decimal digit. | |
| * If display_unit == 0, show value no bigger than 1024 with suffix (K,M,G...), | |
libbb/human_readable.c+4 -2
| @@ -94,7 +94,7 @@ const char* FAST_FUNC make_human_readable_str(unsigned long long val, | |
| /* Convert unsigned long long value into compact 5-char representation. | |
| * String is not terminated (buf[5] is untouched) */ | |
| - | void FAST_FUNC smart_ulltoa5(unsigned long long ul, char buf[5], const char *scale) |
| + | char* FAST_FUNC smart_ulltoa5(unsigned long long ul, char buf[5], const char *scale) |
| { | |
| const char *fmt; | |
| char c; | |
| @@ -145,12 +145,13 @@ void FAST_FUNC smart_ulltoa5(unsigned long long ul, char buf[5], const char *sca | |
| buf[3] = "0123456789"[v]; | |
| buf[4] = scale[idx]; /* typically scale = " kmgt..." */ | |
| } | |
| + | return buf + 5; |
| } | |
| /* Convert unsigned long long value into compact 4-char | |
| * representation. Examples: "1234", "1.2k", " 27M", "123T" | |
| * String is not terminated (buf[4] is untouched) */ | |
| - | void FAST_FUNC smart_ulltoa4(unsigned long long ul, char buf[4], const char *scale) |
| + | char* FAST_FUNC smart_ulltoa4(unsigned long long ul, char buf[4], const char *scale) |
| { | |
| const char *fmt; | |
| char c; | |
| @@ -194,4 +195,5 @@ void FAST_FUNC smart_ulltoa4(unsigned long long ul, char buf[4], const char *sca | |
| buf[2] = "0123456789"[v]; | |
| buf[3] = scale[idx]; /* typically scale = " kmgt..." */ | |
| } | |
| + | return buf + 4; |
| } | |
procps/nmeter.c+1 -2
| @@ -333,8 +333,7 @@ static void scale(ullong ul) | |
| char buf[5]; | |
| /* see http://en.wikipedia.org/wiki/Tera */ | |
| - | smart_ulltoa4(ul, buf, " kmgtpezy"); |
| - | buf[4] = '\0'; |
| + | smart_ulltoa4(ul, buf, " kmgtpezy")[0] = '\0'; |
| put(buf); | |
| } | |
procps/powertop.c+1 -2
| @@ -627,7 +627,6 @@ static void show_timerstats(void) | |
| int i, n = 0; | |
| char strbuf6[6]; | |
| - | strbuf6[5] = '\0'; |
| puts("\nTop causes for wakeups:"); | |
| for (i = 0; i < G.lines_cnt; i++) { | |
| if ((G.lines[i].count > 0 /*|| G.lines[i].disk_count > 0*/) | |
| @@ -639,7 +638,7 @@ static void show_timerstats(void) | |
| /*char c = ' '; | |
| if (G.lines[i].disk_count) | |
| c = 'D';*/ | |
| - | smart_ulltoa5(G.lines[i].count, strbuf6, " KMGTPEZY"); |
| + | smart_ulltoa5(G.lines[i].count, strbuf6, " KMGTPEZY")[0] = '\0'; |
| printf(/*" %5.1f%% (%s)%c %s\n"*/ | |
| " %5.1f%% (%s) %s\n", | |
| G.lines[i].count * 100.0 / G.lines_cumulative_count, | |
procps/ps.c+3 -6
| @@ -299,8 +299,7 @@ static void put_lu(char *buf, int size, unsigned long u) | |
| char buf4[5]; | |
| /* see http://en.wikipedia.org/wiki/Tera */ | |
| - | smart_ulltoa4(u, buf4, " mgtpezy"); |
| - | buf4[4] = '\0'; |
| + | smart_ulltoa4(u, buf4, " mgtpezy")[0] = '\0'; |
| sprintf(buf, "%.*s", size, buf4); | |
| } | |
| @@ -740,8 +739,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |
| #endif | |
| { | |
| char buf6[6]; | |
| - | smart_ulltoa5(p->vsz, buf6, " mgtpezy"); |
| - | buf6[5] = '\0'; |
| + | smart_ulltoa5(p->vsz, buf6, " mgtpezy")[0] = '\0'; |
| #if ENABLE_FEATURE_PS_LONG | |
| if (opts & OPT_l) { | |
| char bufr[6], stime_str[6]; | |
| @@ -752,8 +750,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |
| time_t start = now - elapsed; | |
| struct tm *tm = localtime(&start); | |
| - | smart_ulltoa5(p->rss, bufr, " mgtpezy"); |
| - | bufr[5] = '\0'; |
| + | smart_ulltoa5(p->rss, bufr, " mgtpezy")[0] = '\0'; |
| if (p->tty_major == 136) | |
| /* It should be pts/N, not ptsN, but N > 9 | |
procps/top.c+1 -2
| @@ -847,8 +847,7 @@ static void display_topmem_header(int scr_width, int *lines_rem_p) | |
| static void ulltoa6_and_space(unsigned long long ul, char buf[6]) | |
| { | |
| /* see http://en.wikipedia.org/wiki/Tera */ | |
| - | smart_ulltoa5(ul, buf, " mgtpezy"); |
| - | buf[5] = ' '; |
| + | smart_ulltoa5(ul, buf, " mgtpezy")[0] = '\0'; |
| } | |
| static NOINLINE void display_topmem_process_list(int lines_rem, int scr_width) | |
util-linux/fdisk_gpt.c+2 -4
| @@ -93,9 +93,7 @@ gpt_list_table(int xtra UNUSED_PARAM) | |
| int i; | |
| char numstr6[6]; | |
| - | numstr6[5] = '\0'; |
| - | |
| - | smart_ulltoa5(total_number_of_sectors * sector_size, numstr6, " KMGTPEZY"); |
| + | smart_ulltoa5(total_number_of_sectors * sector_size, numstr6, " KMGTPEZY")[0] = '\0'; |
| printf("Disk %s: %llu sectors, %s\n", disk_device, | |
| (unsigned long long)total_number_of_sectors, | |
| numstr6); | |
| @@ -113,7 +111,7 @@ gpt_list_table(int xtra UNUSED_PARAM) | |
| gpt_partition *p = gpt_part(i); | |
| if (p->lba_start) { | |
| smart_ulltoa5((1 + SWAP_LE64(p->lba_end) - SWAP_LE64(p->lba_start)) * sector_size, | |
| - | numstr6, " KMGTPEZY"); |
| + | numstr6, " KMGTPEZY")[0] = '\0'; |
| printf("%4u %15llu %15llu %11s %04x ", | |
| i + 1, | |
| (unsigned long long)SWAP_LE64(p->lba_start), | |