On the 'utf8-cmdline-prototype' branch: Rename argument to prevent
mentioning 'utf8' in its name, since it is in UTF-8 encoding by libsvn's
convention.
* subversion/include/svn_opt.h,
subversion/libsvn_subr/opt.c
(svn_opt_parse_revprop2): revprop_spec_utf8 → revprop_spec.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/utf8-cmdline-prototype@1926788 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/include/svn_opt.h b/subversion/include/svn_opt.h
index b2af4d5..6ae08ee 100644
--- a/subversion/include/svn_opt.h
+++ b/subversion/include/svn_opt.h
@@ -706,7 +706,7 @@
*/
svn_error_t *
svn_opt_parse_revprop2(apr_hash_t **revprops,
- const char *revprop_spec_utf8,
+ const char *revprop_spec,
apr_pool_t *pool);
/**
diff --git a/subversion/libsvn_subr/opt.c b/subversion/libsvn_subr/opt.c
index 6a66d8a..6848320 100644
--- a/subversion/libsvn_subr/opt.c
+++ b/subversion/libsvn_subr/opt.c
@@ -352,29 +352,28 @@
svn_error_t *
svn_opt_parse_revprop2(apr_hash_t **revprop_table_p,
- const char *revprop_spec_utf8,
+ const char *revprop_spec,
apr_pool_t *pool)
{
const char *sep, *propname;
svn_string_t *propval;
- if (!*revprop_spec_utf8)
+ if (!*revprop_spec)
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("Revision property pair is empty"));
if (!*revprop_table_p)
*revprop_table_p = apr_hash_make(pool);
- sep = strchr(revprop_spec_utf8, '=');
+ sep = strchr(revprop_spec, '=');
if (sep)
{
- propname =
- apr_pstrndup(pool, revprop_spec_utf8, sep - revprop_spec_utf8);
+ propname = apr_pstrndup(pool, revprop_spec, sep - revprop_spec);
propval = svn_string_create(sep + 1, pool);
}
else
{
- propname = apr_pstrdup(pool, revprop_spec_utf8);
+ propname = apr_pstrdup(pool, revprop_spec);
propval = svn_string_create_empty(pool);
}
