svn commit: r1922091 - /subversion/branches/apply-processor/subversion/libsvn_client/merge.c

Author: rinrab
Date: Mon Nov 25 18:47:42 2024
New Revision: 1922091

URL: http://svn.apache.org/viewvc?rev=1922091&view=rev
Log:
On the 'apply-processor' branch: Remove notify_func and notify_baton from
the merge_cmd_baton_t (of merge.c). We no longer use these functions, since
the movement of them to merge_processor.c.

* subversion/libsvn_client/merge.c
  (merge_cmd_baton_t;:notify_func,
   merge_cmd_baton_t;:notify_baton): Remove fields.
  (do_merge): Do not intialize notify_func and notify_baton fields
   of merge_cmd_baton.

No functional changes.

Modified:
    subversion/branches/apply-processor/subversion/libsvn_client/merge.c

Modified: subversion/branches/apply-processor/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/apply-processor/subversion/libsvn_client/merge.c?rev=1922091&r1=1922090&r2=1922091&view=diff
==============================================================================
--- subversion/branches/apply-processor/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/apply-processor/subversion/libsvn_client/merge.c Mon Nov 25 18:47:42 2024
@@ -331,8 +331,6 @@ typedef struct merge_cmd_baton_t {
   apr_pool_t *pool;
 
   /* Our notification callback, that adds a 'begin' notification */
-  svn_wc_notify_func2_t notify_func;
-  void *notify_baton;
   struct notify_begin_state_t notify_begin;
 
 } merge_cmd_baton_t;
@@ -7529,8 +7527,6 @@ do_merge(apr_hash_t **modified_subtrees,
   merge_cmd_baton.added_abspaths = apr_hash_make(result_pool);
   merge_cmd_baton.tree_conflicted_abspaths = apr_hash_make(result_pool);
 
-  merge_cmd_baton.notify_func = notify_merging;
-  merge_cmd_baton.notify_baton = &merge_cmd_baton.notify_begin;
   merge_cmd_baton.notify_begin.merge_b = &merge_cmd_baton;
   merge_cmd_baton.notify_begin.notify_func2 = ctx->notify_func2;
   merge_cmd_baton.notify_begin.notify_baton2 = ctx->notify_baton2;