[BusyBox-cvs] busybox/procps top.c,1.9,1.10

[Glenn McGrath]

Update of /var/cvs/busybox/procps
In directory winder:/tmp/cvs-serv10607/procps

Modified Files:
	top.c 
Log Message:
Splitting statements with #define's can cause trouble for cross 
compilers (and it looks a bit messy) 


Index: top.c
===================================================================
RCS file: /var/cvs/busybox/procps/top.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- top.c	11 Oct 2003 18:47:20 -0000	1.9
+++ top.c	8 Dec 2003 20:31:25 -0000	1.10
@@ -409,17 +409,15 @@
 			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);