Shame, shame. Adding a cast is using covering up an underlying problem. In
this case, that svn_cl__help() should have been declared with a "const".
Shall I fix the const stuff?
(apparently more that I did last time :-( )
Cheers,
-g
On Sat, Nov 18, 2000 at 01:43:28AM -0000, kfogel@tigris.org wrote:
> User: kfogel
> Date: 00/11/17 17:43:28
>
> Modified: subversion/client add-cmd.c delete-cmd.c
> Log:
> Set and remove conflict markers in entries, based on update results,
> and along the way, extend the entry-merging interface:
>
> * libsvn_wc/log.c (conflict_if_rejfile): finished and renamed
> conflict_if_file. All callers changed.
> (log_do_committed): pass SVN_WC_ENTRY_CLEAR_ALL to
> svn_wc__entry_merge_sync, to achieve same behavior as old
> SVN_WC_ENTRY_CLEAR.
>
> * include/svn_wc.h (SVN_WC_ENTRY_CLEAR_NAMED, SVN_WC_ENTRY_CLEAR_ALL):
> new flags, replacing SVN_WC_ENTRY_CLEAR.
>
> * libsvn_wc/entries.c (sync_entry): handle both new flags.
> (svn_wc__entry_merge_sync): document new behavior.
>
> Unrelatedly, fix some warnings in the client:
>
> (svn_cl__add, svn_cl__delete): cast argument to svn_cl__help.
>
> Revision Changes Path
> 1.6 +1 -1 subversion/subversion/client/add-cmd.c
>
> Index: add-cmd.c
> ===================================================================
> RCS file: /cvs/subversion/subversion/client/add-cmd.c,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- add-cmd.c 2000/11/17 09:31:12 1.5
> +++ add-cmd.c 2000/11/18 01:43:27 1.6
> @@ -91,7 +91,7 @@
> else
> {
> fputs ("svn add: object-to-add required\n", stderr);
> - err = svn_cl__help (3, get_help, pool, p_opt_state);
> + err = svn_cl__help (3, (char **) get_help, pool, p_opt_state);
> }
> return err;
> }
>
>
>
> 1.7 +1 -1 subversion/subversion/client/delete-cmd.c
>
> Index: delete-cmd.c
> ===================================================================
> RCS file: /cvs/subversion/subversion/client/delete-cmd.c,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -r1.6 -r1.7
> --- delete-cmd.c 2000/11/17 10:07:11 1.6
> +++ delete-cmd.c 2000/11/18 01:43:27 1.7
> @@ -95,7 +95,7 @@
> else
> {
> fputs ("svn delete: object-to-delete required\n", stderr);
> - err = svn_cl__help (3, get_help, pool, p_opt_state);
> + err = svn_cl__help (3, (char **) get_help, pool, p_opt_state);
> }
>
> return err;
>
>
>
--
Greg Stein, http://www.lyra.org/
Received on Sat Oct 21 14:36:15 2006