Thank you for that sensible change, Joe.
-K
joe@tigris.org writes:
> User: joe
> Date: 00/10/20 12:06:53
>
> Modified: subversion/include svn_path.h
> subversion/libsvn_delta xml_parse.c
> subversion/libsvn_fs delta.c
> subversion/libsvn_subr path.c
> subversion/libsvn_wc adm_crawler.c adm_files.c entries.c
> get_editor.c log.c
> subversion/tests-common svn_test_editor.c
> Log:
> * path.c (svn_path_add_component, svn_path_add_component_nts,
> add_component_internal): Remove redundant pool argument.
>
> All callers changed.
>
> Revision Changes Path
> 1.17 +2 -4 subversion/subversion/include/svn_path.h
>
> Index: svn_path.h
> ===================================================================
> RCS file: /cvs/subversion/subversion/include/svn_path.h,v
> retrieving revision 1.16
> retrieving revision 1.17
> diff -u -r1.16 -r1.17
> --- svn_path.h 2000/10/17 21:48:21 1.16
> +++ svn_path.h 2000/10/20 19:06:51 1.17
> @@ -92,15 +92,13 @@
> a Unix system, it would also be '/'. */
> void svn_path_add_component (svn_string_t *path,
> const svn_string_t *component,
> - enum svn_path_style style,
> - apr_pool_t *pool);
> + enum svn_path_style style);
>
> /* Same as `svn_path_add_component', except that the COMPONENT argument is
> a C-style '\0'-terminated string, not an svn_string_t. */
> void svn_path_add_component_nts (svn_string_t *path,
> const char *component,
> - enum svn_path_style style,
> - apr_pool_t *pool);
> + enum svn_path_style style);
>
> /* Remove one component off the end of PATH. */
> void svn_path_remove_component (svn_string_t *path,
>
>
>
> 1.127 +1 -1 subversion/subversion/libsvn_delta/xml_parse.c
>
> Index: xml_parse.c
> ===================================================================
> RCS file: /cvs/subversion/subversion/libsvn_delta/xml_parse.c,v
> retrieving revision 1.126
> retrieving revision 1.127
> diff -u -r1.126 -r1.127
> --- xml_parse.c 2000/10/20 18:26:10 1.126
> +++ xml_parse.c 2000/10/20 19:06:51 1.127
> @@ -190,7 +190,7 @@
> frame->ancestor_path
> = svn_string_dup (p->ancestor_path, pool);
> svn_path_add_component (frame->ancestor_path, this_name,
> - svn_path_repos_style, pool);
> + svn_path_repos_style);
> }
>
> /* If ancestor_version not set, and see it here, then set it. */
>
>
>
> 1.15 +1 -1 subversion/subversion/libsvn_fs/delta.c
>
> Index: delta.c
> ===================================================================
> RCS file: /cvs/subversion/subversion/libsvn_fs/delta.c,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -r1.14 -r1.15
> --- delta.c 2000/10/10 12:59:35 1.14
> +++ delta.c 2000/10/20 19:06:52 1.15
> @@ -416,7 +416,7 @@
> /* Compute the full name of the ancestor. */
> ancestor_path = svn_string_dup (ancestor_dir_path, c->pool);
> svn_path_add_component (ancestor_path, ancestor_name,
> - svn_path_repos_style, c->pool);
> + svn_path_repos_style);
>
> /* Get the ancestor's version number. */
> ancestor_version = svn_fs_node_version (a);
>
>
>
> 1.19 +5 -8 subversion/subversion/libsvn_subr/path.c
>
> Index: path.c
> ===================================================================
> RCS file: /cvs/subversion/subversion/libsvn_subr/path.c,v
> retrieving revision 1.18
> retrieving revision 1.19
> diff -u -r1.18 -r1.19
> --- path.c 2000/10/17 22:09:27 1.18
> +++ path.c 2000/10/20 19:06:52 1.19
> @@ -80,8 +80,7 @@
> add_component_internal (svn_string_t *path,
> const char *component,
> size_t len,
> - enum svn_path_style style,
> - apr_pool_t *pool)
> + enum svn_path_style style)
> {
> /* kff todo: `style' ignored presently. */
>
> @@ -99,10 +98,9 @@
> void
> svn_path_add_component_nts (svn_string_t *path,
> const char *component,
> - enum svn_path_style style,
> - apr_pool_t *pool)
> + enum svn_path_style style)
> {
> - add_component_internal (path, component, strlen (component), style, pool);
> + add_component_internal (path, component, strlen (component), style);
> }
>
>
> @@ -110,10 +108,9 @@
> void
> svn_path_add_component (svn_string_t *path,
> const svn_string_t *component,
> - enum svn_path_style style,
> - apr_pool_t *pool)
> + enum svn_path_style style)
> {
> - add_component_internal (path, component->data, component->len, style, pool);
> + add_component_internal (path, component->data, component->len, style);
> }
>
>
>
>
>
> 1.43 +6 -6 subversion/subversion/libsvn_wc/adm_crawler.c
>
> Index: adm_crawler.c
> ===================================================================
> RCS file: /cvs/subversion/subversion/libsvn_wc/adm_crawler.c,v
> retrieving revision 1.42
> retrieving revision 1.43
> diff -u -r1.42 -r1.43
> --- adm_crawler.c 2000/10/20 16:45:19 1.42
> +++ adm_crawler.c 2000/10/20 19:06:52 1.43
> @@ -531,7 +531,7 @@
> full_path_to_entry = svn_string_dup (path, subpool);
> if (current_entry_name != NULL)
> svn_path_add_component (full_path_to_entry, current_entry_name,
> - svn_path_local_style, subpool);
> + svn_path_local_style);
>
>
> /* Start examining the current_entry: */
> @@ -574,7 +574,7 @@
> longpath = svn_string_dup (path, top_pool);
> if (current_entry_name != NULL)
> svn_path_add_component (longpath, current_entry_name,
> - svn_path_local_style, top_pool);
> + svn_path_local_style);
> apr_hash_set (affected_targets,
> longpath->data, longpath->len, tb);
> }
> @@ -596,7 +596,7 @@
> if (current_entry_name != NULL)
> svn_path_add_component (new_path,
> current_entry_name,
> - svn_path_local_style, subpool);
> + svn_path_local_style);
>
> err = process_subdirectory (new_path, new_dir_baton,
> editor, edit_baton,
> @@ -655,7 +655,7 @@
> if (current_entry_name != NULL)
> svn_path_add_component (new_path,
> current_entry_name,
> - svn_path_local_style, subpool);
> + svn_path_local_style);
>
> err = process_subdirectory (new_path, new_dir_baton,
> editor, edit_baton,
> @@ -694,7 +694,7 @@
> longpath = svn_string_dup (path, top_pool);
> if (current_entry_name != NULL)
> svn_path_add_component (longpath, current_entry_name,
> - svn_path_local_style, top_pool);
> + svn_path_local_style);
> apr_hash_set (affected_targets,
> longpath->data, longpath->len, tb);
>
> @@ -741,7 +741,7 @@
> longpath = svn_string_dup (path, top_pool);
> if (current_entry_name != NULL)
> svn_path_add_component (longpath, current_entry_name,
> - svn_path_local_style, top_pool);
> + svn_path_local_style);
> apr_hash_set (affected_targets,
> longpath->data, longpath->len, tb);
> }
>
>
>
> 1.46 +3 -3 subversion/subversion/libsvn_wc/adm_files.c
>
> Index: adm_files.c
> ===================================================================
> RCS file: /cvs/subversion/subversion/libsvn_wc/adm_files.c,v
> retrieving revision 1.45
> retrieving revision 1.46
> diff -u -r1.45 -r1.46
> --- adm_files.c 2000/10/19 21:54:04 1.45
> +++ adm_files.c 2000/10/20 19:06:52 1.46
> @@ -111,14 +111,14 @@
> int components_added = 0;
>
> /* Tack on the administrative subdirectory. */
> - svn_path_add_component_nts (path, adm_subdir (), svn_path_local_style, pool);
> + svn_path_add_component_nts (path, adm_subdir (), svn_path_local_style);
> components_added++;
>
> /* If this is a tmp file, name it into the tmp area. */
> if (use_tmp)
> {
> svn_path_add_component_nts
> - (path, SVN_WC__ADM_TMP, svn_path_local_style, pool);
> + (path, SVN_WC__ADM_TMP, svn_path_local_style);
> components_added++;
> }
>
> @@ -128,7 +128,7 @@
> if (this[0] == '\0')
> continue;
>
> - svn_path_add_component_nts (path, this, svn_path_local_style, pool);
> + svn_path_add_component_nts (path, this, svn_path_local_style);
> components_added++;
> }
>
>
>
>
> 1.58 +1 -1 subversion/subversion/libsvn_wc/entries.c
>
> Index: entries.c
> ===================================================================
> RCS file: /cvs/subversion/subversion/libsvn_wc/entries.c,v
> retrieving revision 1.57
> retrieving revision 1.58
> diff -u -r1.57 -r1.58
> --- entries.c 2000/10/20 18:06:44 1.57
> +++ entries.c 2000/10/20 19:06:52 1.58
> @@ -294,7 +294,7 @@
> APR_HASH_KEY_STRING);
> dst->ancestor = svn_string_dup (src->ancestor, pool);
> svn_path_add_component (dst->ancestor, name,
> - svn_path_repos_style, pool);
> + svn_path_repos_style);
> }
> }
>
>
>
>
> 1.99 +2 -3 subversion/subversion/libsvn_wc/get_editor.c
>
> Index: get_editor.c
> ===================================================================
> RCS file: /cvs/subversion/subversion/libsvn_wc/get_editor.c,v
> retrieving revision 1.98
> retrieving revision 1.99
> diff -u -r1.98 -r1.99
> --- get_editor.c 2000/10/19 20:02:21 1.98
> +++ get_editor.c 2000/10/20 19:06:52 1.99
> @@ -149,7 +149,7 @@
> svn_string_t *path = svn_string_dup (parent_path, subpool);
>
> if (name)
> - svn_path_add_component (path, name, svn_path_local_style, subpool);
> + svn_path_add_component (path, name, svn_path_local_style);
>
> d->path = path;
> d->edit_baton = edit_baton;
> @@ -261,8 +261,7 @@
> /* Make the file's on-disk name. */
> svn_path_add_component (path,
> name,
> - svn_path_local_style,
> - subpool);
> + svn_path_local_style);
>
> f->pool = subpool;
> f->dir_baton = parent_dir_baton;
>
>
>
> 1.34 +8 -14 subversion/subversion/libsvn_wc/log.c
>
> Index: log.c
> ===================================================================
> RCS file: /cvs/subversion/subversion/libsvn_wc/log.c,v
> retrieving revision 1.33
> retrieving revision 1.34
> diff -u -r1.33 -r1.34
> --- log.c 2000/10/20 02:19:12 1.33
> +++ log.c 2000/10/20 19:06:52 1.34
> @@ -81,7 +81,7 @@
> void *diff;
>
> filepath = svn_string_dup (path, pool);
> - svn_path_add_component_nts (filepath, name, svn_path_local_style, pool);
> + svn_path_add_component_nts (filepath, name, svn_path_local_style);
>
> /* Get the local edits. */
> err = svn_wc__get_local_changes (svn_wc__gnudiff_differ,
> @@ -114,7 +114,7 @@
> enum svn_node_kind kind;
>
> filepath = svn_string_dup (path, pool);
> - svn_path_add_component_nts (filepath, name, svn_path_local_style, pool);
> + svn_path_add_component_nts (filepath, name, svn_path_local_style);
>
> tmp_text_base = svn_wc__text_base_path (filepath, 1, pool);
> err = svn_io_check_path (tmp_text_base, &kind, pool);
> @@ -205,8 +205,7 @@
> = svn_string_dup (loggy->path, loggy->pool);
> svn_path_add_component (working_file,
> sname,
> - svn_path_local_style,
> - loggy->pool);
> + svn_path_local_style);
>
> err = svn_wc__file_affected_time (×tamp,
> working_file,
> @@ -268,8 +267,7 @@
> working_file = svn_string_dup (loggy->path, loggy->pool);
> svn_path_add_component (working_file,
> sname,
> - svn_path_local_style,
> - loggy->pool);
> + svn_path_local_style);
> tmp_base = svn_wc__text_base_path (working_file, 1, loggy->pool);
>
> err = svn_io_check_path (tmp_base, &kind, loggy->pool);
> @@ -474,8 +472,7 @@
> svn_path_add_component
> (target,
> svn_string_ncreate ((char *) key, keylen, pool),
> - svn_path_local_style,
> - pool);
> + svn_path_local_style);
>
> if (apr_hash_get (targets, target->data, target->len))
> care_about_this_dir = 1;
> @@ -489,8 +486,7 @@
> svn_string_t *subdir = svn_string_dup (path, pool);
> svn_path_add_component (subdir,
> svn_string_create ((char *) key, pool),
> - svn_path_local_style,
> - pool);
> + svn_path_local_style);
>
> err = svn_wc__cleanup (subdir, targets, bail_on_lock, pool);
> if (err)
> @@ -571,8 +567,7 @@
> svn_string_t *subdir = svn_string_dup (path, pool);
> svn_path_add_component (subdir,
> svn_string_create ((char *) key, pool),
> - svn_path_local_style,
> - pool);
> + svn_path_local_style);
>
> err = svn_wc__log_commit (subdir, targets, version, pool);
> if (err)
> @@ -593,8 +588,7 @@
> svn_path_add_component
> (target,
> svn_string_ncreate ((char *) key, keylen, pool),
> - svn_path_local_style,
> - pool);
> + svn_path_local_style);
>
> if (! apr_hash_get (targets, target->data, target->len))
> continue;
>
>
>
> 1.8 +1 -2 subversion/subversion/tests-common/svn_test_editor.c
>
> Index: svn_test_editor.c
> ===================================================================
> RCS file: /cvs/subversion/subversion/tests-common/svn_test_editor.c,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -r1.7 -r1.8
> --- svn_test_editor.c 2000/10/19 23:45:42 1.7
> +++ svn_test_editor.c 2000/10/20 19:06:52 1.8
> @@ -221,8 +221,7 @@
> d->path = svn_string_dup (pd->path, pd->edit_baton->pool);
> svn_path_add_component (d->path,
> svn_string_create (Aname, pd->edit_baton->pool),
> - svn_path_local_style,
> - pd->edit_baton->pool);
> + svn_path_local_style);
> d->edit_baton = pd->edit_baton;
> d->indent_level = (pd->indent_level + indent_amount);
> print_spaces (d->indent_level);
>
>
>
Received on Sat Oct 21 14:36:12 2006