diff options
Diffstat (limited to 'subversion/svn/propedit-cmd.c')
| -rw-r--r-- | subversion/svn/propedit-cmd.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/subversion/svn/propedit-cmd.c b/subversion/svn/propedit-cmd.c index 520fe6c00c87..59ef24bda93b 100644 --- a/subversion/svn/propedit-cmd.c +++ b/subversion/svn/propedit-cmd.c @@ -47,7 +47,7 @@ /*** Code. ***/ struct commit_info_baton { - const char *pname_utf8; + const char *pname; const char *target_local; }; @@ -60,7 +60,7 @@ commit_info_handler(const svn_commit_info_t *commit_info, SVN_ERR(svn_cmdline_printf(pool, _("Set new value for property '%s' on '%s'\n"), - cib->pname_utf8, cib->target_local)); + cib->pname, cib->target_local)); SVN_ERR(svn_cl__print_commit_info(commit_info, NULL, pool)); return SVN_NO_ERROR; @@ -74,23 +74,23 @@ svn_cl__propedit(apr_getopt_t *os, { svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state; svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; - const char *pname, *pname_utf8; + const char *pname; apr_array_header_t *args, *targets; /* Validate the input and get the property's name (and a UTF-8 version of that name). */ SVN_ERR(svn_opt_parse_num_args(&args, os, 1, pool)); pname = APR_ARRAY_IDX(args, 0, const char *); - SVN_ERR(svn_utf_cstring_to_utf8(&pname_utf8, pname, pool)); - if (! svn_prop_name_is_valid(pname_utf8)) + SVN_ERR(svn_utf_cstring_to_utf8(&pname, pname, pool)); + if (! svn_prop_name_is_valid(pname)) return svn_error_createf(SVN_ERR_CLIENT_PROPERTY_NAME, NULL, _("'%s' is not a valid Subversion property name"), - pname_utf8); + pname); if (!opt_state->force) - SVN_ERR(svn_cl__check_svn_prop_name(pname_utf8, opt_state->revprop, + SVN_ERR(svn_cl__check_svn_prop_name(pname, opt_state->revprop, svn_cl__prop_use_edit, pool)); - if (opt_state->encoding && !svn_prop_needs_translation(pname_utf8)) + if (opt_state->encoding && !svn_prop_needs_translation(pname)) return svn_error_create (SVN_ERR_UNSUPPORTED_FEATURE, NULL, _("--encoding option applies only to textual" @@ -120,7 +120,7 @@ svn_cl__propedit(apr_getopt_t *os, &URL, ctx, pool)); /* Fetch the current property. */ - SVN_ERR(svn_client_revprop_get(pname_utf8, &propval, + SVN_ERR(svn_client_revprop_get(pname, &propval, URL, &(opt_state->start_revision), &rev, ctx, pool)); @@ -145,13 +145,13 @@ svn_cl__propedit(apr_getopt_t *os, opt_state->editor_cmd, temp_dir, propval, "svn-prop", ctx->config, - svn_prop_needs_translation(pname_utf8), + svn_prop_needs_translation(pname), opt_state->encoding, pool)); /* ...and re-set the property's value accordingly. */ if (propval) { - SVN_ERR(svn_client_revprop_set2(pname_utf8, + SVN_ERR(svn_client_revprop_set2(pname, propval, &original_propval, URL, &(opt_state->start_revision), &rev, opt_state->force, ctx, pool)); @@ -160,13 +160,13 @@ svn_cl__propedit(apr_getopt_t *os, (svn_cmdline_printf (pool, _("Set new value for property '%s' on revision %ld\n"), - pname_utf8, rev)); + pname, rev)); } else { SVN_ERR(svn_cmdline_printf (pool, _("No changes to property '%s' on revision %ld\n"), - pname_utf8, rev)); + pname, rev)); } } else if (opt_state->start_revision.kind != svn_opt_revision_unspecified) @@ -174,7 +174,7 @@ svn_cl__propedit(apr_getopt_t *os, return svn_error_createf (SVN_ERR_CL_ARG_PARSING_ERROR, NULL, _("Cannot specify revision for editing versioned property '%s'"), - pname_utf8); + pname); } else /* operate on a normal, versioned property (not a revprop) */ { @@ -206,7 +206,7 @@ svn_cl__propedit(apr_getopt_t *os, SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, pool)); - cib.pname_utf8 = pname_utf8; + cib.pname = pname; /* For each target, edit the property PNAME. */ for (i = 0; i < targets->nelts; i++) @@ -234,7 +234,7 @@ svn_cl__propedit(apr_getopt_t *os, peg_revision.kind = svn_opt_revision_unspecified; /* Fetch the current property. */ - SVN_ERR(svn_client_propget5(&props, NULL, pname_utf8, abspath_or_url, + SVN_ERR(svn_client_propget5(&props, NULL, pname, abspath_or_url, &peg_revision, &(opt_state->start_revision), &base_rev, svn_depth_empty, @@ -282,7 +282,7 @@ svn_cl__propedit(apr_getopt_t *os, "svn-prop", ctx->config, svn_prop_needs_translation - (pname_utf8), + (pname), opt_state->encoding, subpool)); @@ -295,7 +295,7 @@ svn_cl__propedit(apr_getopt_t *os, { svn_error_t *err = SVN_NO_ERROR; - svn_cl__check_boolean_prop_val(pname_utf8, edited_propval->data, + svn_cl__check_boolean_prop_val(pname, edited_propval->data, subpool); if (ctx->log_msg_func3) @@ -304,7 +304,7 @@ svn_cl__propedit(apr_getopt_t *os, subpool)); if (svn_path_is_url(target)) { - err = svn_client_propset_remote(pname_utf8, edited_propval, + err = svn_client_propset_remote(pname, edited_propval, target, opt_state->force, base_rev, opt_state->revprop_table, @@ -319,9 +319,9 @@ svn_cl__propedit(apr_getopt_t *os, APR_ARRAY_PUSH(targs, const char *) = target; SVN_ERR(svn_cl__propset_print_binary_mime_type_warning( - targs, pname_utf8, propval, subpool)); + targs, pname, propval, subpool)); - err = svn_client_propset_local(pname_utf8, edited_propval, + err = svn_client_propset_local(pname, edited_propval, targs, svn_depth_empty, opt_state->force, NULL, ctx, subpool); @@ -339,14 +339,14 @@ svn_cl__propedit(apr_getopt_t *os, if (!svn_path_is_url(target)) SVN_ERR(svn_cmdline_printf( subpool, _("Set new value for property '%s' on '%s'\n"), - pname_utf8, target_local)); + pname, target_local)); } else { SVN_ERR (svn_cmdline_printf (subpool, _("No changes to property '%s' on '%s'\n"), - pname_utf8, target_local)); + pname, target_local)); } } svn_pool_destroy(subpool); |