You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gb...@apache.org on 2013/06/03 22:46:59 UTC
svn commit: r1489166 -
/subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/io.c
Author: gbg
Date: Mon Jun 3 20:46:59 2013
New Revision: 1489166
URL: http://svn.apache.org/r1489166
Log:
On the invoke-diff-cmd branch: Improve variable names.
* subversion/libsvn_subr/io.c
(svn_io_create_custom_diff_cmd): Improve variable names.
Modified:
subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/io.c
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/io.c?rev=1489166&r1=1489165&r2=1489166&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/io.c Mon Jun 3 20:46:59 2013
@@ -2931,16 +2931,14 @@ svn_io_create_custom_diff_cmd(const char
const char *cmd,
apr_pool_t *pool)
{
- apr_pool_t *subpool;
+ apr_pool_t *scratch_pool = svn_pool_create(pool);;
apr_array_header_t *tmp;
- const char ** ret;
+ const char ** result;
int argv;
- subpool = svn_pool_create(pool);
-
- tmp = svn_cstring_split(cmd, " ", TRUE, subpool);
+ tmp = svn_cstring_split(cmd, " ", TRUE, scratch_pool);
- ret = apr_palloc(pool,
+ result = apr_palloc(pool,
(tmp->nelts + 1) *
tmp->elt_size*sizeof(char *));
@@ -2949,7 +2947,7 @@ svn_io_create_custom_diff_cmd(const char
svn_stringbuf_t *com;
int i;
- com = svn_stringbuf_create_empty(subpool);
+ com = svn_stringbuf_create_empty(scratch_pool);
svn_stringbuf_appendcstr(com, APR_ARRAY_IDX(tmp, argv, char *));
for (i = 0; i < 6 /* sizeof(token_list) */; i++)
@@ -2960,7 +2958,7 @@ svn_io_create_custom_diff_cmd(const char
int len;
char *found;
- token = svn_stringbuf_create_empty(subpool);
+ token = svn_stringbuf_create_empty(scratch_pool);
svn_stringbuf_appendcstr(token, token_list[i]);
len = 0;
@@ -2993,12 +2991,12 @@ svn_io_create_custom_diff_cmd(const char
label3, strlen(label3));
}
}
- ret[argv] = com->data;
+ result[argv] = com->data;
}
- ret[argv] = NULL;
+ result[argv] = NULL;
- svn_pool_destroy(subpool);
- return ret;
+ svn_pool_destroy(scratch_pool);
+ return result;
}
svn_error_t *