d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r228645, which casts away a number of const conversion warnings

Browse Source 
in contrib/less.  I will fix those more properly in the next commit.
This commit is contained in:
dim 2012-01-01 20:09:05 +00:00
parent c3ff56243b
commit 46cdaf90c3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/less/command.c
View File

@ -1461,7 +1461,7 @@ commands()
error("Command not available", NULL_PARG); error("Command not available", NULL_PARG);
break; break;
} }
start_mca(A_EXAMINE, "Examine: ", (void*)ml_examine, 0); start_mca(A_EXAMINE, "Examine: ", ml_examine, 0);
c = getcc(); c = getcc();
goto again; goto again;
#else #else
@ -1491,7 +1491,7 @@ commands()
error("WARNING: This file was viewed via LESSOPEN", error("WARNING: This file was viewed via LESSOPEN",
NULL_PARG); NULL_PARG);
} }
start_mca(A_SHELL, "!", (void*)ml_shell, 0); start_mca(A_SHELL, "!", ml_shell, 0);
/* /*
* Expand the editor prototype string * Expand the editor prototype string
* and pass it to the system to execute. * and pass it to the system to execute.
@ -1655,7 +1655,7 @@ commands()
error("Command not available", NULL_PARG); error("Command not available", NULL_PARG);
break; break;
} }
start_mca(A_SHELL, "!", (void*)ml_shell, 0); start_mca(A_SHELL, "!", ml_shell, 0);
c = getcc(); c = getcc();
goto again; goto again;
#else #else
@ -1706,7 +1706,7 @@ commands()
if (badmark(c)) if (badmark(c))
break; break;
pipec = c; pipec = c;
start_mca(A_PIPE, "!", (void*)ml_shell, 0); start_mca(A_PIPE, "!", ml_shell, 0);
c = getcc(); c = getcc();
goto again; goto again;
#else #else

6
contrib/less/prompt.c
View File

@ -555,7 +555,7 @@ pr_expand(proto, maxwidth)
public char * public char *
eq_message() 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; type = (!less_is_more) ? pr_type : pr_type ? 0 : 1;
prompt = pr_expand((ch_getflags() & CH_HELPFILE) ? prompt = pr_expand((ch_getflags() & CH_HELPFILE) ?
(char*)hproto : prproto[type], hproto : prproto[type],
sc_width-so_s_width-so_e_width-2); sc_width-so_s_width-so_e_width-2);
new_file = 0; new_file = 0;
return (prompt); return (prompt);
@ -584,5 +584,5 @@ pr_string()
public char * public char *
wait_message() 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));
} }