Date: Sun, 1 Jan 2012 20:09:05 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r229195 - head/contrib/less Message-ID: <201201012009.q01K95IO028499@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sun Jan 1 20:09:05 2012 New Revision: 229195 URL: http://svn.freebsd.org/changeset/base/229195 Log: Revert r228645, which casts away a number of const conversion warnings in contrib/less. I will fix those more properly in the next commit. Modified: head/contrib/less/command.c head/contrib/less/prompt.c Modified: head/contrib/less/command.c ============================================================================== --- head/contrib/less/command.c Sun Jan 1 19:25:43 2012 (r229194) +++ head/contrib/less/command.c Sun Jan 1 20:09:05 2012 (r229195) @@ -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 Modified: head/contrib/less/prompt.c ============================================================================== --- head/contrib/less/prompt.c Sun Jan 1 19:25:43 2012 (r229194) +++ head/contrib/less/prompt.c Sun Jan 1 20:09:05 2012 (r229195) @@ -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)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201012009.q01K95IO028499>