You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2012/11/30 15:15:47 UTC
svn commit: r1415646 - in /subversion/trunk/subversion: include/svn_client.h
svn/list-cmd.c
Author: breser
Date: Fri Nov 30 14:15:45 2012
New Revision: 1415646
URL: http://svn.apache.org/viewvc?rev=1415646&view=rev
Log:
Rename the 'pool' argument to 'scratch_pool'.
* subversion/include/svn_client.h:
(svn_client_list_func2_t): Rename the argument to scratch_pool.
* subversion/svn/list-cmd.c
(print_dirent, print_dirent_xml): Rename the argument to scratch_pool.
Patch by: Vijayaguru G <vijay{_AT_}collab.net>
Modified:
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/svn/list-cmd.c
Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1415646&r1=1415645&r2=1415646&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Fri Nov 30 14:15:45 2012
@@ -5394,7 +5394,7 @@ svn_client_export(svn_revnum_t *result_r
* externals, and will always finish listing an external before listing
* the next one.
- * @a pool may be used for temporary allocations.
+ * @a scratch_pool may be used for temporary allocations.
*
* @since New in 1.8.
*/
@@ -5406,7 +5406,7 @@ typedef svn_error_t *(*svn_client_list_f
const char *abs_path,
const char *external_parent_url,
const char *external_target,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/**
* Similar to #svn_client_list_func2_t, but without any information about
Modified: subversion/trunk/subversion/svn/list-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/list-cmd.c?rev=1415646&r1=1415645&r2=1415646&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/list-cmd.c (original)
+++ subversion/trunk/subversion/svn/list-cmd.c Fri Nov 30 14:15:45 2012
@@ -59,7 +59,7 @@ print_dirent(void *baton,
const char *abs_path,
const char *external_parent_url,
const char *external_target,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
struct print_baton *pb = baton;
const char *entryname;
@@ -80,7 +80,7 @@ print_dirent(void *baton,
if (strcmp(path, "") == 0)
{
if (dirent->kind == svn_node_file)
- entryname = svn_dirent_basename(abs_path, pool);
+ entryname = svn_dirent_basename(abs_path, scratch_pool);
else if (pb->verbose)
entryname = ".";
else
@@ -97,7 +97,7 @@ print_dirent(void *baton,
|| (strcmp(pb->last_external_parent_url, external_parent_url) != 0
|| strcmp(pb->last_external_target, external_target) != 0))
{
- SVN_ERR(svn_cmdline_printf(pool,
+ SVN_ERR(svn_cmdline_printf(scratch_pool,
_("Listing external '%s'"
" defined on '%s':\n"),
external_target,
@@ -138,12 +138,13 @@ print_dirent(void *baton,
timestr[0] = '\0';
/* we need it in UTF-8. */
- SVN_ERR(svn_utf_cstring_to_utf8(&utf8_timestr, timestr, pool));
+ SVN_ERR(svn_utf_cstring_to_utf8(&utf8_timestr, timestr, scratch_pool));
- sizestr = apr_psprintf(pool, "%" SVN_FILESIZE_T_FMT, dirent->size);
+ sizestr = apr_psprintf(scratch_pool, "%" SVN_FILESIZE_T_FMT,
+ dirent->size);
return svn_cmdline_printf
- (pool, "%7ld %-8.8s %c %10s %12s %s%s\n",
+ (scratch_pool, "%7ld %-8.8s %c %10s %12s %s%s\n",
dirent->created_rev,
dirent->last_author ? dirent->last_author : " ? ",
lock ? 'O' : ' ',
@@ -154,7 +155,7 @@ print_dirent(void *baton,
}
else
{
- return svn_cmdline_printf(pool, "%s%s\n", entryname,
+ return svn_cmdline_printf(scratch_pool, "%s%s\n", entryname,
(dirent->kind == svn_node_dir)
? "/" : "");
}
@@ -171,11 +172,11 @@ print_dirent_xml(void *baton,
const char *abs_path,
const char *external_parent_url,
const char *external_target,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
struct print_baton *pb = baton;
const char *entryname;
- svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool);
+ svn_stringbuf_t *sb = svn_stringbuf_create_empty(scratch_pool);
SVN_ERR_ASSERT((external_parent_url == NULL && external_target == NULL) ||
(external_parent_url && external_target));
@@ -183,7 +184,7 @@ print_dirent_xml(void *baton,
if (strcmp(path, "") == 0)
{
if (dirent->kind == svn_node_file)
- entryname = svn_dirent_basename(abs_path, pool);
+ entryname = svn_dirent_basename(abs_path, scratch_pool);
else
/* Don't bother to list if no useful information will be shown. */
return SVN_NO_ERROR;
@@ -205,11 +206,11 @@ print_dirent_xml(void *baton,
{
/* The external item being listed is different from the previous
one, so close the tag. */
- svn_xml_make_close_tag(&sb, pool, "external");
+ svn_xml_make_close_tag(&sb, scratch_pool, "external");
pb->in_external = FALSE;
}
- svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "external",
+ svn_xml_make_open_tag(&sb, scratch_pool, svn_xml_normal, "external",
"parent_url", external_parent_url,
"target", external_target,
NULL);
@@ -220,46 +221,46 @@ print_dirent_xml(void *baton,
}
}
- svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "entry",
+ svn_xml_make_open_tag(&sb, scratch_pool, svn_xml_normal, "entry",
"kind", svn_cl__node_kind_str_xml(dirent->kind),
NULL);
- svn_cl__xml_tagged_cdata(&sb, pool, "name", entryname);
+ svn_cl__xml_tagged_cdata(&sb, scratch_pool, "name", entryname);
if (dirent->kind == svn_node_file)
{
svn_cl__xml_tagged_cdata
- (&sb, pool, "size",
- apr_psprintf(pool, "%" SVN_FILESIZE_T_FMT, dirent->size));
+ (&sb, scratch_pool, "size",
+ apr_psprintf(scratch_pool, "%" SVN_FILESIZE_T_FMT, dirent->size));
}
- svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "commit",
+ svn_xml_make_open_tag(&sb, scratch_pool, svn_xml_normal, "commit",
"revision",
- apr_psprintf(pool, "%ld", dirent->created_rev),
+ apr_psprintf(scratch_pool, "%ld", dirent->created_rev),
NULL);
- svn_cl__xml_tagged_cdata(&sb, pool, "author", dirent->last_author);
+ svn_cl__xml_tagged_cdata(&sb, scratch_pool, "author", dirent->last_author);
if (dirent->time)
- svn_cl__xml_tagged_cdata(&sb, pool, "date",
- svn_time_to_cstring(dirent->time, pool));
- svn_xml_make_close_tag(&sb, pool, "commit");
+ svn_cl__xml_tagged_cdata(&sb, scratch_pool, "date",
+ svn_time_to_cstring(dirent->time, scratch_pool));
+ svn_xml_make_close_tag(&sb, scratch_pool, "commit");
if (lock)
{
- svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "lock", NULL);
- svn_cl__xml_tagged_cdata(&sb, pool, "token", lock->token);
- svn_cl__xml_tagged_cdata(&sb, pool, "owner", lock->owner);
- svn_cl__xml_tagged_cdata(&sb, pool, "comment", lock->comment);
- svn_cl__xml_tagged_cdata(&sb, pool, "created",
+ svn_xml_make_open_tag(&sb, scratch_pool, svn_xml_normal, "lock", NULL);
+ svn_cl__xml_tagged_cdata(&sb, scratch_pool, "token", lock->token);
+ svn_cl__xml_tagged_cdata(&sb, scratch_pool, "owner", lock->owner);
+ svn_cl__xml_tagged_cdata(&sb, scratch_pool, "comment", lock->comment);
+ svn_cl__xml_tagged_cdata(&sb, scratch_pool, "created",
svn_time_to_cstring(lock->creation_date,
- pool));
+ scratch_pool));
if (lock->expiration_date != 0)
- svn_cl__xml_tagged_cdata(&sb, pool, "expires",
+ svn_cl__xml_tagged_cdata(&sb, scratch_pool, "expires",
svn_time_to_cstring
- (lock->expiration_date, pool));
- svn_xml_make_close_tag(&sb, pool, "lock");
+ (lock->expiration_date, scratch_pool));
+ svn_xml_make_close_tag(&sb, scratch_pool, "lock");
}
- svn_xml_make_close_tag(&sb, pool, "entry");
+ svn_xml_make_close_tag(&sb, scratch_pool, "entry");
return svn_cl__error_checked_fputs(sb->data, stdout);
}