You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2013/04/12 14:24:34 UTC
svn commit: r1467247 - in /subversion/trunk/subversion/svn: cl.h
deprecated.c merge-cmd.c
Author: philip
Date: Fri Apr 12 12:24:34 2013
New Revision: 1467247
URL: http://svn.apache.org/r1467247
Log:
Make the command client use a wrapper function when calling a deprecated
function to avoid a compiler warning.
* subversion/svn/cl.h
(svn_cl__deprecated_merge_reintegrate): New.
* subversion/svn/deprecated.c: New file.
* subversion/svn/merge-cmd.c
(run_merge): Use wrapper.
Added:
subversion/trunk/subversion/svn/deprecated.c (with props)
Modified:
subversion/trunk/subversion/svn/cl.h
subversion/trunk/subversion/svn/merge-cmd.c
Modified: subversion/trunk/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1467247&r1=1467246&r2=1467247&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Fri Apr 12 12:24:34 2013
@@ -809,6 +809,16 @@ svn_cl__propset_print_binary_mime_type_w
const svn_string_t *propval,
apr_pool_t *scratch_pool);
+/* A wrapper around the deprecated svn_client_merge_reintegrate. */
+svn_error_t *
+svn_cl__deprecated_merge_reintegrate(const char *source_path_or_url,
+ const svn_opt_revision_t *src_peg_revision,
+ const char *target_wcpath,
+ svn_boolean_t dry_run,
+ const apr_array_header_t *merge_options,
+ svn_client_ctx_t *ctx,
+ apr_pool_t *pool);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Added: subversion/trunk/subversion/svn/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/deprecated.c?rev=1467247&view=auto
==============================================================================
--- subversion/trunk/subversion/svn/deprecated.c (added)
+++ subversion/trunk/subversion/svn/deprecated.c Fri Apr 12 12:24:34 2013
@@ -0,0 +1,41 @@
+/*
+ * deprecated.c: Wrappers to call deprecated functions.
+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ */
+
+#define SVN_DEPRECATED
+#include "cl.h"
+#include "svn_client.h"
+
+svn_error_t *
+svn_cl__deprecated_merge_reintegrate(const char *source_path_or_url,
+ const svn_opt_revision_t *src_peg_revision,
+ const char *target_wcpath,
+ svn_boolean_t dry_run,
+ const apr_array_header_t *merge_options,
+ svn_client_ctx_t *ctx,
+ apr_pool_t *pool)
+{
+ SVN_ERR(svn_client_merge_reintegrate(source_path_or_url, src_peg_revision,
+ target_wcpath, dry_run, merge_options,
+ ctx, pool));
+ return SVN_NO_ERROR;
+}
Propchange: subversion/trunk/subversion/svn/deprecated.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/trunk/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/merge-cmd.c?rev=1467247&r1=1467246&r2=1467247&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Fri Apr 12 12:24:34 2013
@@ -88,7 +88,7 @@ run_merge(svn_boolean_t two_sources_spec
if (opt_state->reintegrate)
{
- merge_err = svn_client_merge_reintegrate(
+ merge_err = svn_cl__deprecated_merge_reintegrate(
sourcepath1, &peg_revision1, targetpath,
opt_state->dry_run, options, ctx, scratch_pool);
}