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

Make smart_ulltoa return pointer to end (allows for code shink in callers)

Browse Source 
function                                             old     new   delta
smart_ulltoa5                                        405     408      +3
smart_ulltoa4                                        273     276      +3
list_table                                          1113    1114      +1
scale                                                 36      34      -2
put_lu                                                55      53      -2
ulltoa6_and_space                                     19      14      -5
powertop_main                                       1470    1461      -9

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2013-09-06 12:53:14 +02:00
parent d6ae4fb446
commit a407cf74cc
7 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
procps/nmeter.c
View File

@ -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);
}

3
procps/powertop.c
View File

@ -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,

9
procps/ps.c
View File

@ -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

3
procps/top.c
View File

@ -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)