...and replace a lint ARGUSED with __unused

ok?

Index: usr.bin/vmstat/vmstat.c
===================================================================
RCS file: /cvs/src/usr.bin/vmstat/vmstat.c,v
retrieving revision 1.140
diff -u -p -r1.140 vmstat.c
--- usr.bin/vmstat/vmstat.c     27 Jul 2016 14:44:59 -0000      1.140
+++ usr.bin/vmstat/vmstat.c     14 Aug 2016 21:45:39 -0000
@@ -424,9 +424,8 @@ printhdr(void)
 /*
  * Force a header to be prepended to the next output.
  */
-/* ARGSUSED */
 void
-needhdr(int signo)
+needhdr(__unused int signo)
 {
 
        hdrcnt = 1;
@@ -689,7 +688,7 @@ dointr(void)
        inttotal = 0;
        for (i = 0; i < nintr; i++) {
                char name[128];
-               u_quad_t cnt;
+               uint64_t cnt;
                int vector;
 
                mib[0] = CTL_KERN;
@@ -747,7 +746,7 @@ domem(void)
        int i, j, len, size, first, mib[4];
        u_long totuse = 0, totfree = 0;
        char buf[BUFSIZ], *bufp, *ap;
-       quad_t totreq = 0;
+       unsigned long long totreq = 0;
        const char *name;
        size_t siz;
 
@@ -893,7 +892,7 @@ domem(void)
                totreq += ks->ks_calls;
        }
        (void)printf("\nMemory Totals:  In Use    Free    Requests\n");
-       (void)printf("              %7luK %6luK    %8qu\n",
+       (void)printf("              %7luK %6luK    %8llu\n",
             (totuse + 1023) / 1024, (totfree + 1023) / 1024, totreq);
 }
 
Index: usr.sbin/pstat/pstat.c
===================================================================
RCS file: /cvs/src/usr.sbin/pstat/pstat.c,v
retrieving revision 1.107
diff -u -p -r1.107 pstat.c
--- usr.sbin/pstat/pstat.c      18 Jul 2016 11:48:55 -0000      1.107
+++ usr.sbin/pstat/pstat.c      14 Aug 2016 21:45:39 -0000
@@ -530,7 +530,7 @@ ufs_print(struct vnode *vp)
                else
                        (void)printf(" %7s", name);
        else
-               (void)printf(" %7qd", ip->i_ffs1_size);
+               (void)printf(" %7lld", (long long)ip->i_ffs1_size);
        return (0);
 }
 
@@ -630,7 +630,7 @@ nfs_print(struct vnode *vp)
                else
                        (void)printf(" %7s", name);
        else
-               (void)printf(" %7qd", np->n_size);
+               (void)printf(" %7lld", (long long)np->n_size);
        return (0);
 }
 

Reply via email to