[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r29617 - trunk/subversion/svn

From: David Glasser <glasser_at_davidglasser.net>
Date: Thu, 28 Feb 2008 14:38:36 -0800

On Thu, Feb 28, 2008 at 12:54 PM, <julianfoad_at_tigris.org> wrote:
> Author: julianfoad
> Date: Thu Feb 28 12:54:56 2008
> New Revision: 29617
>
> Log:
> Enhance a doc string.
>
> * subversion/svn/cl.h
> (svn_cl__conflict_handler): Mention the type that this function implements.
>
>
> Modified:
> trunk/subversion/svn/cl.h
>
> Modified: trunk/subversion/svn/cl.h
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/cl.h?pathrev=29617&r1=29616&r2=29617
> ==============================================================================
> --- trunk/subversion/svn/cl.h (original)
> +++ trunk/subversion/svn/cl.h Thu Feb 28 12:54:56 2008
> @@ -288,7 +288,8 @@
>
> /* A conflict-resolution callback which prompts the user to choose
> one of the 3 fulltexts, edit the merged file on the spot, or just
> - skip the conflict (to be resolved later). */
> + skip the conflict (to be resolved later).
> + Implements @c svn_wc_conflict_resolver_func_t. */
> svn_error_t *
> svn_cl__conflict_handler(svn_wc_conflict_result_t **result,
> const svn_wc_conflict_description_t *desc,

One thing I noticed recently is that rather than throwing in all these
comments, we could just declare functions as

svn_wc_conflict_resolver_func_t svn_cl__conflict_handler;

(We can do this even for static functions; for example, I noticed
declarations of svn_opt_subcommand_t like this at the top of
svnadmin/main.c.)

Is this something we should consider doing more often?

--dave

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-28 23:39:09 CET

This is an archived mail posted to the Subversion Dev mailing list.