4 files changed, 6 insertions, 6 deletions

diff --git a/procps/pmap.c b/procps/pmap.c
index fd995a54d..aa221cfb8 100644
--- a/procps/pmap.c
+++ b/procps/pmap.c
@@ -20,7 +20,7 @@
 //usage:#define pmap_trivial_usage
 //usage:       "[-xq] PID"
 //usage:#define pmap_full_usage "\n\n"
-//usage:       "Display detailed process memory usage"
+//usage:       "Display process memory usage"
 //usage:     "\n"
 //usage:     "\n        -x      Show details"
 //usage:     "\n        -q      Quiet"
@@ -66,7 +66,7 @@ static int procps_get_maps(pid_t pid, unsigned opt)
         int ret;
         char buf[256];
 
-        read_cmdline(buf, sizeof(buf), pid, "no such process");
+        read_cmdline(buf, sizeof(buf), pid, NULL);
         printf("%u: %s\n", (int)pid, buf);
 
         if (!(opt & OPT_q) && (opt & OPT_x))
diff --git a/procps/ps.c b/procps/ps.c
index 07ff7568f..8c373376d 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -638,7 +638,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
          * and such large widths */
         terminal_width = MAX_WIDTH;
         if (isatty(1)) {
-                get_terminal_width_height(0, &terminal_width, NULL);
+                terminal_width = get_terminal_width(0);
                 if (--terminal_width > MAX_WIDTH)
                         terminal_width = MAX_WIDTH;
         }
@@ -688,7 +688,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         if (w_count) {
                 terminal_width = (w_count == 1) ? 132 : MAX_WIDTH;
         } else {
-                get_terminal_width_height(0, &terminal_width, NULL);
+                terminal_width = get_terminal_width(0);
                 /* Go one less... */
                 if (--terminal_width > MAX_WIDTH)
                         terminal_width = MAX_WIDTH;
diff --git a/procps/pstree.c b/procps/pstree.c
index ed1a41289..c5fb83688 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -381,7 +381,7 @@ int pstree_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        get_terminal_width_height(0, &G.output_width, NULL);
+        G.output_width = get_terminal_width(0);
 
         opt_complementary = "?1";
         getopt32(argv, "p");
diff --git a/procps/watch.c b/procps/watch.c
index 0397f21bf..97aa04767 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -72,7 +72,7 @@ int watch_main(int argc UNUSED_PARAM, char **argv)
 
                         // STDERR_FILENO is procps3 compat:
                         // "watch ls 2>/dev/null" does not detect tty size
-                        get_terminal_width_height(STDERR_FILENO, &new_width, NULL);
+                        new_width = get_terminal_width(STDERR_FILENO);
                         if (new_width != width) {
                                 width = new_width;
                                 free(header);