Splitting statements with #define's can cause trouble for cross

compilers (and it looks a bit messy)


git-svn-id: svn://busybox.net/trunk/busybox@8058 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 5 insertions, 7 deletions

diff --git a/procps/top.c b/procps/top.c
index 9944598c2..64b3c0732 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -409,17 +409,15 @@ static void display_status(int count, int col)
                         sprintf(rss_str_buf, "%6ldM", s->rss/1024);
                 else
                         sprintf(rss_str_buf, "%7ld", s->rss);
-                printf(
 #ifdef FEATURE_CPU_USAGE_PERCENTAGE
-                        "%5d %-8s %s  %s %5d %2d.%d %2u.%u ",
+                printf("%5d %-8s %s  %s %5d %2d.%d %2u.%u ",
+                        s->pid, s->user, s->state, rss_str_buf, s->ppid,
+                        s->pcpu/10, s->pcpu%10, pmem/10, pmem%10);
 #else
-                        "%5d %-8s %s  %s %5d %2u.%u ",
-#endif
+                printf("%5d %-8s %s  %s %5d %2u.%u ",
                         s->pid, s->user, s->state, rss_str_buf, s->ppid,
-#ifdef FEATURE_CPU_USAGE_PERCENTAGE
-                        s->pcpu/10, s->pcpu%10,
-#endif
                         pmem/10, pmem%10);
+#endif
                         if(strlen(namecmd) > col)
                                 namecmd[col] = 0;
                         printf("%s\n", namecmd);