Module Name: src
Committed By: joerg
Date: Tue May 24 12:31:56 UTC 2011
Modified Files:
src/usr.bin/less/less: prompt.c
Log Message:
Fix const issues
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/less/less/prompt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/less/less/prompt.c
diff -u src/usr.bin/less/less/prompt.c:1.13 src/usr.bin/less/less/prompt.c:1.14
--- src/usr.bin/less/less/prompt.c:1.13 Sat Feb 16 07:20:54 2008
+++ src/usr.bin/less/less/prompt.c Tue May 24 12:31:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: prompt.c,v 1.13 2008/02/16 07:20:54 matt Exp $ */
+/* $NetBSD: prompt.c,v 1.14 2011/05/24 12:31:56 joerg Exp $ */
/*
* Copyright (C) 1984-2004 Mark Nudelman
@@ -71,8 +71,8 @@
static POSITION curr_byte __P((int));
static int cond __P((int, int));
static void protochar __P((int, int, int));
-static char *skipcond __P((char *));
-static char *wherechar __P((char *, int *));
+static const char *skipcond __P((const char *));
+static const char *wherechar __P((const char *, int *));
/*
* Initialize the prompt prototype strings.
@@ -401,9 +401,9 @@
* where to resume parsing the string.
* We must keep track of nested IFs and skip them properly.
*/
- static char *
+ static const char *
skipcond(p)
- register char *p;
+ register const char *p;
{
register int iflevel;
@@ -459,9 +459,9 @@
/*
* Decode a char that represents a position on the screen.
*/
- static char *
+ static const char *
wherechar(p, wp)
- char *p;
+ const char *p;
int *wp;
{
switch (*p)
@@ -485,10 +485,10 @@
*/
public char *
pr_expand(proto, maxwidth)
- char *proto;
+ const char *proto;
int maxwidth;
{
- register char *p;
+ register const char *p;
register int c;
int where;
