top(1): fix several style & const related issues

- use parens for return
- put function names on newline
- sprinkle const where possible

1 files changed, 22 insertions, 28 deletions

diff --git a/usr.bin/top/display.c b/usr.bin/top/display.c
index 76b596693792..490844f996f5 100644
--- a/usr.bin/top/display.c
+++ b/usr.bin/top/display.c
@@ -464,8 +464,8 @@ void
 u_cpustates(int *states)
 {
     int value;
-    char **names;
-    char *thisname;
+    const char * const *names;
+    const char *thisname;
     int *lp;
     int *colp;
     int cpu;
@@ -514,40 +514,34 @@ void
 z_cpustates(void)
 {
     int i = 0;
-    char **names;
+    const char **names;
     char *thisname;
-    int *lp;
     int cpu, value;
 
-for (cpu = 0; cpu < num_cpus; cpu++) {
-    names = cpustate_names;
+    for (cpu = 0; cpu < num_cpus; cpu++) {
+	    names = cpustate_names;
 
-    /* show tag and bump lastline */
-    if (num_cpus == 1)
-	printf("\nCPU: ");
-    else {
-	value = printf("\nCPU %d: ", cpu);
-	while (value++ <= cpustates_column)
-		printf(" ");
-    }
-    lastline++;
+	    /* show tag and bump lastline */
+	    if (num_cpus == 1)
+		    printf("\nCPU: ");
+	    else {
+		    value = printf("\nCPU %d: ", cpu);
+		    while (value++ <= cpustates_column)
+			    printf(" ");
+	    }
+	    lastline++;
 
-    while ((thisname = *names++) != NULL)
-    {
-	if (*thisname != '\0')
-	{
-	    printf("%s    %% %s", (i++ % num_cpustates) == 0 ? "" : ", ", thisname);
-	}
+	    while ((thisname = *names++) != NULL)
+	    {
+		    if (*thisname != '\0')
+		    {
+			    printf("%s    %% %s", (i++ % num_cpustates) == 0 ? "" : ", ", thisname);
+		    }
+	    }
     }
-}
 
     /* fill the "last" array with all -1s, to insure correct updating */
-    lp = lcpustates;
-    i = num_cpustates * num_cpus;
-    while (--i >= 0)
-    {
-	*lp++ = -1;
-    }
+    memset(lcpustates, -1, num_cpustates * num_cpus);
 }
 
 /*