In contrib/less, cast away const a bunch of times, to make it build
without conversion warnings. This code desparately needs a good dose of const poison, but fixing all the issues would be rather disruptive. MFC after: 1 week
This commit is contained in:
parent
8f3ae92165
commit
8ee4178c4c
@ -1461,7 +1461,7 @@ commands()
|
||||
error("Command not available", NULL_PARG);
|
||||
break;
|
||||
}
|
||||
start_mca(A_EXAMINE, "Examine: ", ml_examine, 0);
|
||||
start_mca(A_EXAMINE, "Examine: ", (void*)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, "!", ml_shell, 0);
|
||||
start_mca(A_SHELL, "!", (void*)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, "!", ml_shell, 0);
|
||||
start_mca(A_SHELL, "!", (void*)ml_shell, 0);
|
||||
c = getcc();
|
||||
goto again;
|
||||
#else
|
||||
@ -1706,7 +1706,7 @@ commands()
|
||||
if (badmark(c))
|
||||
break;
|
||||
pipec = c;
|
||||
start_mca(A_PIPE, "!", ml_shell, 0);
|
||||
start_mca(A_PIPE, "!", (void*)ml_shell, 0);
|
||||
c = getcc();
|
||||
goto again;
|
||||
#else
|
||||
|
@ -555,7 +555,7 @@ pr_expand(proto, maxwidth)
|
||||
public char *
|
||||
eq_message()
|
||||
{
|
||||
return (pr_expand(eqproto, 0));
|
||||
return (pr_expand((char*)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) ?
|
||||
hproto : prproto[type],
|
||||
(char*)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(wproto, sc_width-so_s_width-so_e_width-2));
|
||||
return (pr_expand((char*)wproto, sc_width-so_s_width-so_e_width-2));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user