summaryrefslogtreecommitdiffstats
path: root/contrib/less
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2012-01-01 20:13:02 +0000
committerdim <dim@FreeBSD.org>2012-01-01 20:13:02 +0000
commit4a643207b240e975c07808e969d7545d1d8c0b31 (patch)
treea020c34dea84d7e5ae99ebf56bafd300c3816ba6 /contrib/less
parent46cdaf90c3e6a08ea00152956ec665dd2326a247 (diff)
downloadFreeBSD-src-4a643207b240e975c07808e969d7545d1d8c0b31.zip
FreeBSD-src-4a643207b240e975c07808e969d7545d1d8c0b31.tar.gz
Redo r228645, but instead of casting away const conversion warnings in
contrib/less, add a few const qualifiers in the right places. Suggested by: das MFC after: 1 week
Diffstat (limited to 'contrib/less')
-rw-r--r--contrib/less/command.c4
-rw-r--r--contrib/less/prompt.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/contrib/less/command.c b/contrib/less/command.c
index 41c3869..def3d36 100644
--- a/contrib/less/command.c
+++ b/contrib/less/command.c
@@ -105,7 +105,7 @@ cmd_exec()
start_mca(action, prompt, mlist, cmdflags)
int action;
char *prompt;
- void *mlist;
+ void constant *mlist;
int cmdflags;
{
mca = action;
@@ -686,7 +686,7 @@ make_display()
static void
prompt()
{
- register char *p;
+ register char constant *p;
if (ungot != NULL)
{
diff --git a/contrib/less/prompt.c b/contrib/less/prompt.c
index daad00d..53e66dc 100644
--- a/contrib/less/prompt.c
+++ b/contrib/less/prompt.c
@@ -394,9 +394,9 @@ protochar(c, where, iseditproto)
* where to resume parsing the string.
* We must keep track of nested IFs and skip them properly.
*/
- static char *
+ static char constant *
skipcond(p)
- register char *p;
+ register char constant *p;
{
register int iflevel;
@@ -452,9 +452,9 @@ skipcond(p)
/*
* Decode a char that represents a position on the screen.
*/
- static char *
+ static char constant *
wherechar(p, wp)
- char *p;
+ char constant *p;
int *wp;
{
switch (*p)
@@ -478,10 +478,10 @@ wherechar(p, wp)
*/
public char *
pr_expand(proto, maxwidth)
- char *proto;
+ char constant *proto;
int maxwidth;
{
- register char *p;
+ register char constant *p;
register int c;
int where;
OpenPOWER on IntegriCloud