You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pe...@apache.org on 2011/08/16 18:01:31 UTC
svn commit: r1158343 - /subversion/trunk/subversion/svn/status.c
Author: peters
Date: Tue Aug 16 16:01:30 2011
New Revision: 1158343
URL: http://svn.apache.org/viewvc?rev=1158343&view=rev
Log:
Followup to r1157537,1157682:
* subversion/svn/status.c
(print_status): For clarity, change apr_psprintf(apr_psprintf()) to
apr_pstrcat(apr_psprintf()). Building a format string from another
format string was very confusing to me.
Modified:
subversion/trunk/subversion/svn/status.c
Modified: subversion/trunk/subversion/svn/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status.c?rev=1158343&r1=1158342&r2=1158343&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status.c (original)
+++ subversion/trunk/subversion/svn/status.c Tue Aug 16 16:01:30 2011
@@ -279,11 +279,10 @@ print_status(const char *path,
SVN_ERR(svn_dirent_get_absolute(&cwd, "", pool));
relpath = make_relpath(cwd, status->moved_from_abspath, pool, pool);
relpath = svn_dirent_local_style(relpath, pool);
- moved_from_line = apr_psprintf(pool,
- apr_psprintf(pool,
- "\n > %s",
- _("moved from %s")),
- relpath);
+ moved_from_line = apr_pstrcat(pool, "\n > ",
+ apr_psprintf(pool, _("moved from %s"),
+ relpath),
+ (char *)NULL);
}
/* Only print an extra moved-to line for the op-root of a move-away.
@@ -299,11 +298,10 @@ print_status(const char *path,
SVN_ERR(svn_dirent_get_absolute(&cwd, "", pool));
relpath = make_relpath(cwd, status->moved_to_abspath, pool, pool);
relpath = svn_dirent_local_style(relpath, pool);
- moved_to_line = apr_psprintf(pool,
- apr_psprintf(pool,
- "\n > %s",
- _("moved to %s")),
- relpath);
+ moved_to_line = apr_pstrcat(pool, "\n > ",
+ apr_psprintf(pool, _("moved to %s"),
+ relpath),
+ (char *)NULL);
}
if (detailed)