diff options
| author | dim <dim@FreeBSD.org> | 2012-01-01 20:09:05 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-01-01 20:09:05 +0000 |
| commit | 46cdaf90c3e6a08ea00152956ec665dd2326a247 (patch) | |
| tree | 54ccebf99257d3835bf0732b07adee84c4c0abe6 /contrib/less | |
| parent | c3ff56243b9d716e74544bef440aa812f115faed (diff) | |
| download | FreeBSD-src-46cdaf90c3e6a08ea00152956ec665dd2326a247.zip FreeBSD-src-46cdaf90c3e6a08ea00152956ec665dd2326a247.tar.gz | |
Revert r228645, which casts away a number of const conversion warnings
in contrib/less. I will fix those more properly in the next commit.
Diffstat (limited to 'contrib/less')
| -rw-r--r-- | contrib/less/command.c | 8 | ||||
| -rw-r--r-- | contrib/less/prompt.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/contrib/less/command.c b/contrib/less/command.c index e8c4994..41c3869 100644 --- a/contrib/less/command.c +++ b/contrib/less/command.c @@ -1461,7 +1461,7 @@ commands() error("Command not available", NULL_PARG); break; } - start_mca(A_EXAMINE, "Examine: ", (void*)ml_examine, 0); + start_mca(A_EXAMINE, "Examine: ", ml_examine, 0); c = getcc(); goto again; #else @@ -1491,7 +1491,7 @@ commands() error("WARNING: This file was viewed via LESSOPEN", NULL_PARG); } - start_mca(A_SHELL, "!", (void*)ml_shell, 0); + start_mca(A_SHELL, "!", ml_shell, 0); /* * Expand the editor prototype string * and pass it to the system to execute. @@ -1655,7 +1655,7 @@ commands() error("Command not available", NULL_PARG); break; } - start_mca(A_SHELL, "!", (void*)ml_shell, 0); + start_mca(A_SHELL, "!", ml_shell, 0); c = getcc(); goto again; #else @@ -1706,7 +1706,7 @@ commands() if (badmark(c)) break; pipec = c; - start_mca(A_PIPE, "!", (void*)ml_shell, 0); + start_mca(A_PIPE, "!", ml_shell, 0); c = getcc(); goto again; #else diff --git a/contrib/less/prompt.c b/contrib/less/prompt.c index 00d3152..daad00d 100644 --- a/contrib/less/prompt.c +++ b/contrib/less/prompt.c @@ -555,7 +555,7 @@ pr_expand(proto, maxwidth) public char * eq_message() { - return (pr_expand((char*)eqproto, 0)); + return (pr_expand(eqproto, 0)); } /* @@ -572,7 +572,7 @@ pr_string() type = (!less_is_more) ? pr_type : pr_type ? 0 : 1; prompt = pr_expand((ch_getflags() & CH_HELPFILE) ? - (char*)hproto : prproto[type], + hproto : prproto[type], sc_width-so_s_width-so_e_width-2); new_file = 0; return (prompt); @@ -584,5 +584,5 @@ pr_string() public char * wait_message() { - return (pr_expand((char*)wproto, sc_width-so_s_width-so_e_width-2)); + return (pr_expand(wproto, sc_width-so_s_width-so_e_width-2)); } |
