From bdbc9a5cb9f2ae1898a1c2989402e3a74769061c Mon Sep 17 00:00:00 2001
From: Garance A Drosehn <gad@FreeBSD.org>
Date: Tue, 22 Jun 2004 02:15:58 +0000
Subject: [PATCH] Oops. Undo that last 'const' change. It expects similar
changes to some other files that I am not ready to commit yet...
---
bin/ps/extern.h | 2 +-
bin/ps/fmt.c | 22 ++++++++++------------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index dd72e20ec5b6..3642fc991246 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -50,7 +50,7 @@ int donlist(void);
void elapsed(KINFO *, VARENT *);
void emulname(KINFO *, VARENT *);
VARENT *find_varentry(VAR *);
-const char *fmt_argv(const char **, const char *, size_t);
+const char *fmt_argv(char **, char *, size_t);
double getpcpu(const KINFO *);
void kvar(KINFO *, VARENT *);
void label(KINFO *, VARENT *);
diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
index f7c09145fc24..d6e0109b526e 100644
--- a/bin/ps/fmt.c
+++ b/bin/ps/fmt.c
@@ -51,17 +51,16 @@ __FBSDID("$FreeBSD$");
#include "ps.h"
-static const char *cmdpart(const char *);
-static const char *shquote(const char **);
+static char *cmdpart(char *);
+static char *shquote(char **);
-static const char *
-shquote(const char **argv)
+static char *
+shquote(char **argv)
{
long arg_max;
static size_t buf_size;
size_t len;
- const char **p, *src;
- char *dst;
+ char **p, *dst, *src;
static char *buf = NULL;
if (buf == NULL) {
@@ -97,20 +96,19 @@ shquote(const char **argv)
return (buf);
}
-static const char *
-cmdpart(const char *arg0)
+static char *
+cmdpart(char *arg0)
{
- const char *cp;
+ char *cp;
return ((cp = strrchr(arg0, '/')) != NULL ? cp + 1 : arg0);
}
const char *
-fmt_argv(const char **argv, const char *cmd, size_t maxlen)
+fmt_argv(char **argv, char *cmd, size_t maxlen)
{
size_t len;
- const char *ap;
- char *cp;
+ char *ap, *cp;
if (argv == NULL || argv[0] == NULL) {
if (cmd == NULL)