use err/warn from C library

[unix-history] / usr / src / bin / ps / nlist.c

diff --git a/usr/src/bin/ps/nlist.c b/usr/src/bin/ps/nlist.c
index 0e18623..59d01a0 100644 (file)
--- a/usr/src/bin/ps/nlist.c
+++ b/usr/src/bin/ps/nlist.c
@@ -6,17 +6,22 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)nlist.c    5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)nlist.c    5.8 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/proc.h>

-#include <nlist.h>
+#include <sys/resource.h>
+
+#include <err.h>

 #include <errno.h>
 #include <errno.h>

+#include <kvm.h>
+#include <nlist.h>

 #include <stdio.h>
 #include <string.h>
 #include <stdio.h>
 #include <string.h>

-#include <kvm.h>
+
+#include "ps.h"

 
 #ifdef SPPWAIT
 #define NEWVM
 
 #ifdef SPPWAIT
 #define NEWVM


@@ -49,6 +54,7 @@ extern kvm_t *kd;
 #define kread(x, v) \
        kvm_read(kd, psnl[x].n_value, (char *)&v, sizeof v) != sizeof(v)
 
 #define kread(x, v) \
        kvm_read(kd, psnl[x].n_value, (char *)&v, sizeof v) != sizeof(v)
 

+int

 donlist()
 {
        extern int eval;
 donlist()
 {
        extern int eval;


@@ -62,43 +68,44 @@ donlist()
        if (kvm_nlist(kd, psnl)) {
                nlisterr(psnl);
                eval = 1;
        if (kvm_nlist(kd, psnl)) {
                nlisterr(psnl);
                eval = 1;

-               return(1);
+               return (1);

        }
        if (kread(X_FSCALE, fscale)) {
        }
        if (kread(X_FSCALE, fscale)) {

-               (void)fprintf(stderr, "ps: fscale: %s\n", kvm_geterr(kd));
+               warnx("fscale: %s", kvm_geterr(kd));

                eval = rval = 1;
        }
 #ifdef NEWVM
        if (kread(X_AVAILEND, mempages)) {
                eval = rval = 1;
        }
 #ifdef NEWVM
        if (kread(X_AVAILEND, mempages)) {

-               (void)fprintf(stderr, "ps: avail_start: %s\n", kvm_geterr(kd));
+               warnx("avail_start: %s", kvm_geterr(kd));

                eval = rval = 1;
        }
        if (kread(X_AVAILSTART, tmp)) {
                eval = rval = 1;
        }
        if (kread(X_AVAILSTART, tmp)) {

-               (void)fprintf(stderr, "ps: avail_end: %s\n", kvm_geterr(kd));
+               warnx("avail_end: %s", kvm_geterr(kd));

                eval = rval = 1;
        }
        mempages -= tmp;
 #else
        if (kread(X_ECMX, mempages)) {
                eval = rval = 1;
        }
        mempages -= tmp;
 #else
        if (kread(X_ECMX, mempages)) {

-               (void)fprintf(stderr, "ps: ecmx: %s\n", kvm_geterr(kd));
+               warnx("ecmx: %s", kvm_geterr(kd));

                eval = rval = 1;
        }
 #endif
        if (kread(X_CCPU, ccpu)) {
                eval = rval = 1;
        }
 #endif
        if (kread(X_CCPU, ccpu)) {

-               (void)fprintf(stderr, "ps: ccpu: %s\n", kvm_geterr(kd));
+               warnx("ccpu: %s", kvm_geterr(kd));

                eval = rval = 1;
        }
                eval = rval = 1;
        }

-       return(rval);
+       return (rval);

 }
 
 }
 

+void

 nlisterr(nl)
        struct nlist nl[];
 {
        int i;
 
 nlisterr(nl)
        struct nlist nl[];
 {
        int i;
 

-       fprintf(stderr, "ps: nlist: can't find following symbols:");
+       (void)fprintf(stderr, "ps: nlist: can't find following symbols:");

        for (i = 0; nl[i].n_name != NULL; i++)
                if (nl[i].n_value == 0)
        for (i = 0; nl[i].n_name != NULL; i++)
                if (nl[i].n_value == 0)

-                       fprintf(stderr, " %s", nl[i].n_name);
-       fprintf(stderr, "\n");
+                       (void)fprintf(stderr, " %s", nl[i].n_name);
+       (void)fprintf(stderr, "\n");

 }
 }