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

Re: svn commit: r33768 - trunk/subversion/libsvn_fs_fs

From: Greg Stein <gstein_at_gmail.com>
Date: Mon, 20 Oct 2008 04:23:34 -0700

You missed a %ld in there which needs to be %%ld.

On Sun, Oct 19, 2008 at 7:29 PM, <arfrever_at_tigris.org> wrote:
> Author: arfrever
> Date: Sun Oct 19 19:29:57 2008
> New Revision: 33768
>
> Log:
> * subversion/libsvn_fs_fs/rep-cache.c
> (svn_fs_fs__set_rep_reference): Pass translatable string to apr_psprintf()
> to create intermediate string with appropriate format specifier, because
> xgettext doesn't expand preprocessor definitions.
>
> Modified:
> trunk/subversion/libsvn_fs_fs/rep-cache.c
>
> Modified: trunk/subversion/libsvn_fs_fs/rep-cache.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_fs/rep-cache.c?pathrev=33768&r1=33767&r2=33768
> ==============================================================================
> --- trunk/subversion/libsvn_fs_fs/rep-cache.c Sun Oct 19 18:31:27 2008 (r33767)
> +++ trunk/subversion/libsvn_fs_fs/rep-cache.c Sun Oct 19 19:29:57 2008 (r33768)
> @@ -139,15 +139,18 @@ svn_fs_fs__set_rep_reference(svn_fs_t *f
> || (old_rep->size != rep->size)
> || (old_rep->expanded_size != rep->expanded_size)) )
> return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
> - _("Representation key for checksum '%s' exists in filesystem "
> - "'%s', with different value(%ld,%" APR_OFF_T_FMT ",%"
> - SVN_FILESIZE_T_FMT ",%" SVN_FILESIZE_T_FMT ") than what we "
> - "were about to store(%ld,%" APR_OFF_T_FMT ",%"
> - SVN_FILESIZE_T_FMT ",%" SVN_FILESIZE_T_FMT ")"),
> - svn_checksum_to_cstring_display(rep->checksum, pool),
> - fs->path, old_rep->revision, old_rep->offset, old_rep->size,
> - old_rep->expanded_size, rep->revision, rep->offset, rep->size,
> - rep->expanded_size);
> + apr_psprintf(pool,
> + _("Representation key for checksum '%%s' exists "
> + "in filesystem '%%s', with different value "
> + "(%%ld,%%%s,%%%s,%%%s) than what we were about"
> + " to store(%ld,%%%s,%%%s,%%%s)"),
> + APR_OFF_T_FMT, SVN_FILESIZE_T_FMT,
> + SVN_FILESIZE_T_FMT, APR_OFF_T_FMT,
> + SVN_FILESIZE_T_FMT, SVN_FILESIZE_T_FMT),
> + svn_checksum_to_cstring_display(rep->checksum, pool),
> + fs->path, old_rep->revision, old_rep->offset, old_rep->size,
> + old_rep->expanded_size, rep->revision, rep->offset, rep->size,
> + rep->expanded_size);
> else
> return SVN_NO_ERROR;
> }
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-20 13:23:51 CEST

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