Hi tech --

Silence some warnings in top(1) found by WARNINGS=yes.

~Brian

Index: machine.c
===================================================================
RCS file: /cvs/src/usr.bin/top/machine.c,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 machine.c
--- machine.c   15 Mar 2017 04:24:14 -0000      1.88
+++ machine.c   30 May 2017 01:29:45 -0000
@@ -159,14 +159,14 @@ int
 getncpu(void)
 {
        int mib[] = { CTL_HW, HW_NCPU };
-       int ncpu;
-       size_t size = sizeof(ncpu);
+       int numcpu;
+       size_t size = sizeof(numcpu);
 
        if (sysctl(mib, sizeof(mib) / sizeof(mib[0]),
-           &ncpu, &size, NULL, 0) == -1)
+           &numcpu, &size, NULL, 0) == -1)
                return (-1);
 
-       return (ncpu);
+       return (numcpu);
 }
 
 int
@@ -545,7 +545,7 @@ format_comm(struct kinfo_proc *kp)
 }
 
 char *
-format_next_process(caddr_t handle, char *(*get_userid)(uid_t), pid_t *pid,
+format_next_process(caddr_t hndl, char *(*get_userid)(uid_t), pid_t *pid,
     int show_threads)
 {
        char *p_wait;
@@ -556,7 +556,7 @@ format_next_process(caddr_t handle, char
        char buf[16];
 
        /* find and remember the next proc structure */
-       hp = (struct handle *) handle;
+       hp = (struct handle *) hndl;
        pp = *(hp->next_proc++);
        hp->remaining--;
 

Reply via email to