You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2017/02/17 16:20:21 UTC
svn commit: r1783422 -
/subversion/trunk/tools/client-side/svnconflict/svnconflict.c
Author: stsp
Date: Fri Feb 17 16:20:21 2017
New Revision: 1783422
URL: http://svn.apache.org/viewvc?rev=1783422&view=rev
Log:
Follow-up to r1783416: Try to unbreak the build on Windows.
* tools/client-side/svnconflict/svnconflict.c
(svnconflict_resolve_text, svnconflict_resolve_prop,
svnconflict_resolve_tree): Use explicit casts to convert int to enum.
Modified:
subversion/trunk/tools/client-side/svnconflict/svnconflict.c
Modified: subversion/trunk/tools/client-side/svnconflict/svnconflict.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svnconflict/svnconflict.c?rev=1783422&r1=1783421&r2=1783422&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svnconflict/svnconflict.c (original)
+++ subversion/trunk/tools/client-side/svnconflict/svnconflict.c Fri Feb 17 16:20:21 2017
@@ -515,6 +515,7 @@ svnconflict_resolve_text(apr_getopt_t *o
svn_client_ctx_t *ctx = b->ctx;
apr_array_header_t *args;
const char *option_id_str;
+ int optid;
svn_client_conflict_option_id_t option_id;
const char *path;
const char *local_abspath;
@@ -524,7 +525,8 @@ svnconflict_resolve_text(apr_getopt_t *o
SVN_ERR(svn_opt_parse_num_args(&args, os, 2, pool));
option_id_str = APR_ARRAY_IDX(args, 0, const char *);
path = APR_ARRAY_IDX(args, 1, const char *);
- SVN_ERR(svn_cstring_atoi(&option_id, option_id_str));
+ SVN_ERR(svn_cstring_atoi(&optid, option_id_str));
+ option_id = (svn_client_conflict_option_id_t)optid;
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
SVN_ERR(get_conflicts(&text_conflicted, NULL, NULL,
@@ -549,6 +551,7 @@ svnconflict_resolve_prop(apr_getopt_t *o
svn_client_ctx_t *ctx = b->ctx;
apr_array_header_t *args;
const char *option_id_str;
+ int optid;
svn_client_conflict_option_id_t option_id;
const char *path;
const char *propname;
@@ -560,7 +563,8 @@ svnconflict_resolve_prop(apr_getopt_t *o
propname = APR_ARRAY_IDX(args, 0, const char *);
option_id_str = APR_ARRAY_IDX(args, 1, const char *);
path = APR_ARRAY_IDX(args, 2, const char *);
- SVN_ERR(svn_cstring_atoi(&option_id, option_id_str));
+ SVN_ERR(svn_cstring_atoi(&optid, option_id_str));
+ option_id = (svn_client_conflict_option_id_t)optid;
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
SVN_ERR(get_conflicts(NULL, &props_conflicted, NULL,
@@ -585,6 +589,7 @@ svnconflict_resolve_tree(apr_getopt_t *o
svn_client_ctx_t *ctx = b->ctx;
apr_array_header_t *args;
const char *option_id_str;
+ int optid;
svn_client_conflict_option_id_t option_id;
const char *path;
const char *local_abspath;
@@ -594,7 +599,8 @@ svnconflict_resolve_tree(apr_getopt_t *o
SVN_ERR(svn_opt_parse_num_args(&args, os, 2, pool));
option_id_str = APR_ARRAY_IDX(args, 0, const char *);
path = APR_ARRAY_IDX(args, 1, const char *);
- SVN_ERR(svn_cstring_atoi(&option_id, option_id_str));
+ SVN_ERR(svn_cstring_atoi(&optid, option_id_str));
+ option_id = (svn_client_conflict_option_id_t)optid;
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
SVN_ERR(get_conflicts(NULL, NULL, &tree_conflicted,