You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/03/12 13:36:25 UTC
svn commit: r922239 [2/2] - in /subversion/trunk/subversion: include/
include/private/ libsvn_client/ libsvn_delta/ libsvn_fs/ libsvn_fs_base/
libsvn_fs_fs/ libsvn_ra/ libsvn_ra_local/ libsvn_ra_neon/ libsvn_ra_serf/
libsvn_ra_svn/ libsvn_repos/ libsvn...
Modified: subversion/trunk/subversion/libsvn_repos/rev_hunt.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/rev_hunt.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/rev_hunt.c (original)
+++ subversion/trunk/subversion/libsvn_repos/rev_hunt.c Fri Mar 12 12:36:23 2010
@@ -640,7 +640,7 @@ svn_repos_trace_node_locations(svn_fs_t
apr_hash_t **locations,
const char *fs_path,
svn_revnum_t peg_revision,
- apr_array_header_t *location_revisions_orig,
+ const apr_array_header_t *location_revisions_orig,
svn_repos_authz_func_t authz_read_func,
void *authz_read_baton,
apr_pool_t *pool)
@@ -1189,14 +1189,15 @@ compare_path_revisions(const void *a, co
static svn_error_t *
find_merged_revisions(apr_array_header_t **merged_path_revisions_out,
- apr_array_header_t *mainline_path_revisions,
+ const apr_array_header_t *mainline_path_revisions,
svn_repos_t *repos,
apr_hash_t *duplicate_path_revs,
svn_repos_authz_func_t authz_read_func,
void *authz_read_baton,
apr_pool_t *pool)
{
- apr_array_header_t *old, *new;
+ const apr_array_header_t *old;
+ apr_array_header_t *new;
apr_pool_t *iter_pool, *last_pool;
apr_array_header_t *merged_path_revisions = apr_array_make(pool, 0,
sizeof(struct path_revision *));
Modified: subversion/trunk/subversion/libsvn_subr/auth.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/auth.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/auth.c (original)
+++ subversion/trunk/subversion/libsvn_subr/auth.c Fri Mar 12 12:36:23 2010
@@ -101,7 +101,7 @@ struct svn_auth_iterstate_t
void
svn_auth_open(svn_auth_baton_t **auth_baton,
- apr_array_header_t *providers,
+ const apr_array_header_t *providers,
apr_pool_t *pool)
{
svn_auth_baton_t *ab;
Modified: subversion/trunk/subversion/libsvn_subr/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cmdline.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cmdline.c Fri Mar 12 12:36:23 2010
@@ -661,7 +661,7 @@ svn_cmdline__parse_config_option(apr_arr
svn_error_t *
svn_cmdline__apply_config_options(apr_hash_t *config,
- apr_array_header_t *config_options,
+ const apr_array_header_t *config_options,
const char *prefix,
const char *argument_name)
{
Modified: subversion/trunk/subversion/libsvn_subr/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/deprecated.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_subr/deprecated.c Fri Mar 12 12:36:23 2010
@@ -415,7 +415,7 @@ svn_opt_subcommand_help(const char *subc
svn_error_t *
svn_opt_args_to_target_array3(apr_array_header_t **targets_p,
apr_getopt_t *os,
- apr_array_header_t *known_targets,
+ const apr_array_header_t *known_targets,
apr_pool_t *pool)
{
return svn_opt__args_to_target_array(targets_p, os,known_targets, pool);
@@ -424,7 +424,7 @@ svn_opt_args_to_target_array3(apr_array_
svn_error_t *
svn_opt_args_to_target_array2(apr_array_header_t **targets_p,
apr_getopt_t *os,
- apr_array_header_t *known_targets,
+ const apr_array_header_t *known_targets,
apr_pool_t *pool)
{
svn_error_t *err = svn_opt_args_to_target_array3(targets_p, os,
@@ -442,7 +442,7 @@ svn_opt_args_to_target_array2(apr_array_
svn_error_t *
svn_opt_args_to_target_array(apr_array_header_t **targets_p,
apr_getopt_t *os,
- apr_array_header_t *known_targets,
+ const apr_array_header_t *known_targets,
svn_opt_revision_t *start_revision,
svn_opt_revision_t *end_revision,
svn_boolean_t extract_revisions,
@@ -905,7 +905,7 @@ svn_mergeinfo_inheritable(svn_mergeinfo_
svn_error_t *
svn_rangelist_inheritable(apr_array_header_t **inheritable_rangelist,
- apr_array_header_t *rangelist,
+ const apr_array_header_t *rangelist,
svn_revnum_t start,
svn_revnum_t end,
apr_pool_t *pool)
Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Fri Mar 12 12:36:23 2010
@@ -696,7 +696,7 @@ svn_mergeinfo_parse(svn_mergeinfo_t *mer
svn_error_t *
svn_rangelist_merge(apr_array_header_t **rangelist,
- apr_array_header_t *changes,
+ const apr_array_header_t *changes,
apr_pool_t *pool)
{
int i, j;
@@ -867,8 +867,8 @@ svn_mergeinfo__set_inheritance(svn_merge
### are legacy from when it was solely the remove() impl. */
static svn_error_t *
rangelist_intersect_or_remove(apr_array_header_t **output,
- apr_array_header_t *eraser,
- apr_array_header_t *whiteboard,
+ const apr_array_header_t *eraser,
+ const apr_array_header_t *whiteboard,
svn_boolean_t do_remove,
svn_boolean_t consider_inheritance,
apr_pool_t *pool)
@@ -1033,8 +1033,8 @@ rangelist_intersect_or_remove(apr_array_
svn_error_t *
svn_rangelist_intersect(apr_array_header_t **output,
- apr_array_header_t *rangelist1,
- apr_array_header_t *rangelist2,
+ const apr_array_header_t *rangelist1,
+ const apr_array_header_t *rangelist2,
svn_boolean_t consider_inheritance,
apr_pool_t *pool)
{
@@ -1044,8 +1044,8 @@ svn_rangelist_intersect(apr_array_header
svn_error_t *
svn_rangelist_remove(apr_array_header_t **output,
- apr_array_header_t *eraser,
- apr_array_header_t *whiteboard,
+ const apr_array_header_t *eraser,
+ const apr_array_header_t *whiteboard,
svn_boolean_t consider_inheritance,
apr_pool_t *pool)
{
@@ -1055,7 +1055,7 @@ svn_rangelist_remove(apr_array_header_t
svn_error_t *
svn_rangelist_diff(apr_array_header_t **deleted, apr_array_header_t **added,
- apr_array_header_t *from, apr_array_header_t *to,
+ const apr_array_header_t *from, const apr_array_header_t *to,
svn_boolean_t consider_inheritance,
apr_pool_t *pool)
{
@@ -1537,7 +1537,7 @@ svn_mergeinfo_inheritable2(svn_mergeinfo
svn_error_t *
svn_rangelist_inheritable2(apr_array_header_t **inheritable_rangelist,
- apr_array_header_t *rangelist,
+ const apr_array_header_t *rangelist,
svn_revnum_t start,
svn_revnum_t end,
svn_boolean_t inheritable,
@@ -1675,7 +1675,7 @@ svn_mergeinfo__add_suffix_to_mergeinfo(s
}
apr_array_header_t *
-svn_rangelist_dup(apr_array_header_t *rangelist, apr_pool_t *pool)
+svn_rangelist_dup(const apr_array_header_t *rangelist, apr_pool_t *pool)
{
apr_array_header_t *new_rl = apr_array_make(pool, rangelist->nelts,
sizeof(svn_merge_range_t *));
Modified: subversion/trunk/subversion/libsvn_subr/opt.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/opt.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/opt.c (original)
+++ subversion/trunk/subversion/libsvn_subr/opt.c Fri Mar 12 12:36:23 2010
@@ -739,7 +739,7 @@ svn_opt_parse_path(svn_opt_revision_t *r
svn_error_t *
svn_opt__args_to_target_array(apr_array_header_t **targets_p,
apr_getopt_t *os,
- apr_array_header_t *known_targets,
+ const apr_array_header_t *known_targets,
apr_pool_t *pool)
{
int i;
@@ -1067,7 +1067,7 @@ svn_opt_print_help3(apr_getopt_t *os,
svn_error_t *
svn_opt_eat_peg_revisions(apr_array_header_t **true_targets_p,
- apr_array_header_t *targets,
+ const apr_array_header_t *targets,
apr_pool_t *pool)
{
int i;
Modified: subversion/trunk/subversion/libsvn_subr/sorts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sorts.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sorts.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sorts.c Fri Mar 12 12:36:23 2010
@@ -196,7 +196,7 @@ bsearch_lower_bound(const void *key,
int
svn_sort__bsearch_lower_bound(const void *key,
- apr_array_header_t *array,
+ const apr_array_header_t *array,
int (*compare_func)(const void *, const void *))
{
return bsearch_lower_bound(key,
Modified: subversion/trunk/subversion/libsvn_subr/svn_string.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/svn_string.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/svn_string.c (original)
+++ subversion/trunk/subversion/libsvn_subr/svn_string.c Fri Mar 12 12:36:23 2010
@@ -536,7 +536,7 @@ svn_cstring_split(const char *input,
svn_boolean_t svn_cstring_match_glob_list(const char *str,
- apr_array_header_t *list)
+ const apr_array_header_t *list)
{
int i;
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Fri Mar 12 12:36:23 2010
@@ -653,7 +653,7 @@ svn_wc_queue_committed3(svn_wc_committed
processed recursively, return FALSE otherwise.
*/
static svn_boolean_t
-have_recursive_parent(apr_array_header_t *queue, int item)
+have_recursive_parent(const apr_array_header_t *queue, int item)
{
int i;
const char *local_abspath
Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Fri Mar 12 12:36:23 2010
@@ -2346,7 +2346,7 @@ svn_wc_get_status_editor3(const svn_delt
svn_depth_t depth,
svn_boolean_t get_all,
svn_boolean_t no_ignore,
- apr_array_header_t *ignore_patterns,
+ const apr_array_header_t *ignore_patterns,
svn_wc_status_func2_t status_func,
void *status_baton,
svn_cancel_func_t cancel_func,
@@ -2729,7 +2729,7 @@ svn_wc_get_update_editor3(svn_revnum_t *
svn_wc_get_file_t fetch_func,
void *fetch_baton,
const char *diff3_cmd,
- apr_array_header_t *preserved_exts,
+ const apr_array_header_t *preserved_exts,
const svn_delta_editor_t **editor,
void **edit_baton,
svn_wc_traversal_info_t *traversal_info,
@@ -2844,7 +2844,7 @@ svn_wc_get_switch_editor3(svn_revnum_t *
svn_wc_conflict_resolver_func_t conflict_func,
void *conflict_baton,
const char *diff3_cmd,
- apr_array_header_t *preserved_exts,
+ const apr_array_header_t *preserved_exts,
const svn_delta_editor_t **editor,
void **edit_baton,
svn_wc_traversal_info_t *traversal_info,
Modified: subversion/trunk/subversion/libsvn_wc/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff.c Fri Mar 12 12:36:23 2010
@@ -514,7 +514,7 @@ get_working_mimetype(const char **mimety
*/
static apr_hash_t *
apply_propchanges(apr_hash_t *props,
- apr_array_header_t *propchanges)
+ const apr_array_header_t *propchanges)
{
apr_hash_t *newprops = apr_hash_copy(apr_hash_pool_get(props), props);
int i;
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Fri Mar 12 12:36:23 2010
@@ -755,7 +755,7 @@ send_unversioned_item(const struct walk_
const char *local_abspath,
svn_node_kind_t path_kind,
svn_boolean_t path_special,
- apr_array_header_t *patterns,
+ const apr_array_header_t *patterns,
svn_boolean_t no_ignore,
svn_wc_status_func4_t status_func,
void *status_baton,
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Fri Mar 12 12:36:23 2010
@@ -170,7 +170,7 @@ struct edit_baton
/* Array of file extension patterns to preserve as extensions in
generated conflict files. */
- apr_array_header_t *ext_patterns;
+ const apr_array_header_t *ext_patterns;
/* The revision we're targeting...or something like that. This
starts off as a pointer to the revision to which we are updating,
@@ -1229,7 +1229,7 @@ accumulate_last_change(struct last_chang
svn_wc_notify_lock_state_t *lock_state,
svn_wc__db_t *db,
const char *local_abspath,
- apr_array_header_t *entry_props,
+ const apr_array_header_t *entry_props,
apr_pool_t *scratch_pool,
apr_pool_t *result_pool)
{
@@ -3144,7 +3144,7 @@ change_dir_prop(void *dir_baton,
null. If PROPCHANGES contains more than one such change, return
the first. */
static const svn_prop_t *
-externals_prop_changed(apr_array_header_t *propchanges)
+externals_prop_changed(const apr_array_header_t *propchanges)
{
int i;
@@ -5455,7 +5455,7 @@ make_editor(svn_revnum_t *target_revisio
svn_wc_get_file_t fetch_func,
void *fetch_baton,
const char *diff3_cmd,
- apr_array_header_t *preserved_exts,
+ const apr_array_header_t *preserved_exts,
const svn_delta_editor_t **editor,
void **edit_baton,
apr_pool_t *result_pool,
@@ -5600,7 +5600,7 @@ svn_wc_get_update_editor4(const svn_delt
svn_boolean_t depth_is_sticky,
svn_boolean_t allow_unver_obstructions,
const char *diff3_cmd,
- apr_array_header_t *preserved_exts,
+ const apr_array_header_t *preserved_exts,
svn_wc_get_file_t fetch_func,
void *fetch_baton,
svn_wc_conflict_resolver_func_t conflict_func,
@@ -5639,7 +5639,7 @@ svn_wc_get_switch_editor4(const svn_delt
svn_boolean_t depth_is_sticky,
svn_boolean_t allow_unver_obstructions,
const char *diff3_cmd,
- apr_array_header_t *preserved_exts,
+ const apr_array_header_t *preserved_exts,
svn_wc_get_file_t fetch_func,
void *fetch_baton,
svn_wc_conflict_resolver_func_t conflict_func,
Modified: subversion/trunk/subversion/libsvn_wc/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/util.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/util.c (original)
+++ subversion/trunk/subversion/libsvn_wc/util.c Fri Mar 12 12:36:23 2010
@@ -236,7 +236,7 @@ void svn_wc__compat_call_notify_func(voi
}
svn_boolean_t
-svn_wc_match_ignore_list(const char *str, apr_array_header_t *list,
+svn_wc_match_ignore_list(const char *str, const apr_array_header_t *list,
apr_pool_t *pool)
{
/* For now, we simply forward to svn_cstring_match_glob_list. In the
Modified: subversion/trunk/subversion/mod_dav_svn/dav_svn.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/dav_svn.h?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/dav_svn.h (original)
+++ subversion/trunk/subversion/mod_dav_svn/dav_svn.h Fri Mar 12 12:36:23 2010
@@ -761,7 +761,7 @@ dav_svn__simple_parse_uri(dav_svn__uri_i
apr_pool_t *pool);
-int dav_svn__find_ns(apr_array_header_t *namespaces, const char *uri);
+int dav_svn__find_ns(const apr_array_header_t *namespaces, const char *uri);
Modified: subversion/trunk/subversion/mod_dav_svn/reports/file-revs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/file-revs.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/reports/file-revs.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/reports/file-revs.c Fri Mar 12 12:36:23 2010
@@ -139,7 +139,7 @@ file_rev_handler(void *baton,
svn_boolean_t merged_revision,
svn_txdelta_window_handler_t *window_handler,
void **window_baton,
- apr_array_header_t *props,
+ const apr_array_header_t *props,
apr_pool_t *pool)
{
struct file_rev_baton *frb = baton;
Modified: subversion/trunk/subversion/mod_dav_svn/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/util.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/util.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/util.c Fri Mar 12 12:36:23 2010
@@ -381,7 +381,7 @@ dav_svn__simple_parse_uri(dav_svn__uri_i
/* ### move this into apr_xml */
int
-dav_svn__find_ns(apr_array_header_t *namespaces, const char *uri)
+dav_svn__find_ns(const apr_array_header_t *namespaces, const char *uri)
{
int i;
Modified: subversion/trunk/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Fri Mar 12 12:36:23 2010
@@ -445,7 +445,7 @@ svn_cl__print_xml_commit(svn_stringbuf_t
*/
svn_error_t *
svn_cl__revprop_prepare(const svn_opt_revision_t *revision,
- apr_array_header_t *targets,
+ const apr_array_header_t *targets,
const char **URL,
svn_client_ctx_t *ctx,
apr_pool_t *pool);
@@ -694,7 +694,7 @@ svn_cl__changelist_paths(apr_array_heade
svn_error_t *
svn_cl__args_to_target_array_print_reserved(apr_array_header_t **targets_p,
apr_getopt_t *os,
- apr_array_header_t *known_targets,
+ const apr_array_header_t *known_targets,
svn_client_ctx_t *ctx,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/svn/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/props.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/props.c (original)
+++ subversion/trunk/subversion/svn/props.c Fri Mar 12 12:36:23 2010
@@ -47,7 +47,7 @@
svn_error_t *
svn_cl__revprop_prepare(const svn_opt_revision_t *revision,
- apr_array_header_t *targets,
+ const apr_array_header_t *targets,
const char **URL,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
Modified: subversion/trunk/subversion/svn/switch-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/switch-cmd.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/switch-cmd.c (original)
+++ subversion/trunk/subversion/svn/switch-cmd.c Fri Mar 12 12:36:23 2010
@@ -40,7 +40,7 @@
/*** Code. ***/
static svn_error_t *
-rewrite_urls(apr_array_header_t *targets,
+rewrite_urls(const apr_array_header_t *targets,
svn_boolean_t recurse,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
Modified: subversion/trunk/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/util.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/util.c (original)
+++ subversion/trunk/subversion/svn/util.c Fri Mar 12 12:36:23 2010
@@ -1100,7 +1100,7 @@ svn_cl__operation_str_human_readable(svn
svn_error_t *
svn_cl__args_to_target_array_print_reserved(apr_array_header_t **targets,
apr_getopt_t *os,
- apr_array_header_t *known_targets,
+ const apr_array_header_t *known_targets,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
Modified: subversion/trunk/subversion/svndumpfilter/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svndumpfilter/main.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/svndumpfilter/main.c (original)
+++ subversion/trunk/subversion/svndumpfilter/main.c Fri Mar 12 12:36:23 2010
@@ -110,7 +110,7 @@ write_prop_to_stringbuf(svn_stringbuf_t
/* Prefix matching function to compare node-path with set of prefixes. */
static svn_boolean_t
-ary_prefix_match(apr_array_header_t *pfxlist, const char *path)
+ary_prefix_match(const apr_array_header_t *pfxlist, const char *path)
{
int i, pfx_len, path_len = strlen(path);
const char *pfx;
@@ -133,7 +133,7 @@ ary_prefix_match(apr_array_header_t *pfx
/* Check whether we need to skip this PATH based on its presence in
the PREFIXES list, and the DO_EXCLUDE option. */
static APR_INLINE svn_boolean_t
-skip_path(const char *path, apr_array_header_t *prefixes,
+skip_path(const char *path, const apr_array_header_t *prefixes,
svn_boolean_t do_exclude, svn_boolean_t glob)
{
const svn_boolean_t matches =
Modified: subversion/trunk/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Fri Mar 12 12:36:23 2010
@@ -693,7 +693,7 @@ static svn_error_t *must_have_access(svn
*/
static svn_error_t *set_path(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
report_driver_baton_t *b = baton;
const char *path, *lock_token, *depth_word;
@@ -720,7 +720,7 @@ static svn_error_t *set_path(svn_ra_svn_
}
static svn_error_t *delete_path(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
report_driver_baton_t *b = baton;
const char *path;
@@ -733,7 +733,7 @@ static svn_error_t *delete_path(svn_ra_s
}
static svn_error_t *link_path(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
report_driver_baton_t *b = baton;
const char *path, *url, *lock_token, *fs_path, *depth_word;
@@ -760,7 +760,7 @@ static svn_error_t *link_path(svn_ra_svn
}
static svn_error_t *finish_report(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
report_driver_baton_t *b = baton;
@@ -772,7 +772,7 @@ static svn_error_t *finish_report(svn_ra
}
static svn_error_t *abort_report(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
report_driver_baton_t *b = baton;
@@ -864,7 +864,7 @@ static svn_error_t *accept_report(svn_bo
* values. */
static svn_error_t *write_prop_diffs(svn_ra_svn_conn_t *conn,
apr_pool_t *pool,
- apr_array_header_t *propdiffs)
+ const apr_array_header_t *propdiffs)
{
int i;
@@ -930,7 +930,7 @@ static svn_error_t *get_props(apr_hash_t
/* Set BATON->FS_PATH for the repository URL found in PARAMS. */
static svn_error_t *reparent(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
const char *url;
@@ -948,7 +948,7 @@ static svn_error_t *reparent(svn_ra_svn_
}
static svn_error_t *get_latest_rev(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
svn_revnum_t rev;
@@ -962,7 +962,7 @@ static svn_error_t *get_latest_rev(svn_r
}
static svn_error_t *get_dated_rev(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
svn_revnum_t rev;
@@ -980,7 +980,7 @@ static svn_error_t *get_dated_rev(svn_ra
}
static svn_error_t *change_rev_prop(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
svn_revnum_t rev;
@@ -1003,7 +1003,7 @@ static svn_error_t *change_rev_prop(svn_
}
static svn_error_t *rev_proplist(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
svn_revnum_t rev;
@@ -1023,7 +1023,7 @@ static svn_error_t *rev_proplist(svn_ra_
}
static svn_error_t *rev_prop(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
svn_revnum_t rev;
@@ -1065,7 +1065,7 @@ static svn_error_t *commit_done(const sv
* to the client. Use POOL for temporary allocations only.
*/
static svn_error_t *add_lock_tokens(svn_ra_svn_conn_t *conn,
- apr_array_header_t *lock_tokens,
+ const apr_array_header_t *lock_tokens,
server_baton_t *sb,
apr_pool_t *pool)
{
@@ -1117,7 +1117,7 @@ static svn_error_t *add_lock_tokens(svn_
/* Unlock the paths with lock tokens in LOCK_TOKENS, ignoring any errors.
LOCK_TOKENS contains svn_ra_svn_item_t elements, assumed to be lists. */
-static svn_error_t *unlock_paths(apr_array_header_t *lock_tokens,
+static svn_error_t *unlock_paths(const apr_array_header_t *lock_tokens,
server_baton_t *sb,
svn_ra_svn_conn_t *conn,
apr_pool_t *pool)
@@ -1159,7 +1159,7 @@ static svn_error_t *unlock_paths(apr_arr
}
static svn_error_t *commit(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
const char *log_msg = NULL,
@@ -1263,7 +1263,7 @@ static svn_error_t *commit(svn_ra_svn_co
}
static svn_error_t *get_file(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
const char *path, *full_path, *hex_digest;
@@ -1348,7 +1348,7 @@ static svn_error_t *get_file(svn_ra_svn_
}
static svn_error_t *get_dir(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
const char *path, *full_path, *file_path, *cauthor, *cdate;
@@ -1512,7 +1512,7 @@ static svn_error_t *get_dir(svn_ra_svn_c
}
static svn_error_t *update(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
svn_revnum_t rev;
@@ -1565,7 +1565,7 @@ static svn_error_t *update(svn_ra_svn_co
}
static svn_error_t *switch_cmd(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
svn_revnum_t rev;
@@ -1610,7 +1610,7 @@ static svn_error_t *switch_cmd(svn_ra_sv
}
static svn_error_t *status(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
svn_revnum_t rev;
@@ -1645,7 +1645,7 @@ static svn_error_t *status(svn_ra_svn_co
}
static svn_error_t *diff(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
svn_revnum_t rev;
@@ -1709,7 +1709,7 @@ static svn_error_t *diff(svn_ra_svn_conn
ASSUMPTION: When performing a 'merge' with two URLs at different
revisions, the client will call this command more than once. */
static svn_error_t *get_mergeinfo(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
svn_revnum_t rev;
@@ -1848,7 +1848,7 @@ static svn_error_t *log_receiver(void *b
}
static svn_error_t *log_cmd(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
svn_error_t *err, *write_err;
server_baton_t *b = baton;
@@ -1949,7 +1949,7 @@ static svn_error_t *log_cmd(svn_ra_svn_c
}
static svn_error_t *check_path(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
svn_revnum_t rev;
@@ -1979,7 +1979,7 @@ static svn_error_t *check_path(svn_ra_sv
}
static svn_error_t *stat_cmd(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
svn_revnum_t rev;
@@ -2026,7 +2026,7 @@ static svn_error_t *stat_cmd(svn_ra_svn_
}
static svn_error_t *get_locations(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
svn_error_t *err, *write_err;
server_baton_t *b = baton;
@@ -2119,7 +2119,7 @@ static svn_error_t *gls_receiver(svn_loc
static svn_error_t *get_location_segments(svn_ra_svn_conn_t *conn,
apr_pool_t *pool,
- apr_array_header_t *params,
+ const apr_array_header_t *params,
void *baton)
{
svn_error_t *err, *write_err;
@@ -2209,7 +2209,7 @@ static svn_error_t *file_rev_handler(voi
svn_boolean_t merged_revision,
svn_txdelta_window_handler_t *d_handler,
void **d_baton,
- apr_array_header_t *prop_diffs,
+ const apr_array_header_t *prop_diffs,
apr_pool_t *pool)
{
file_revs_baton_t *frb = baton;
@@ -2244,7 +2244,7 @@ static svn_error_t *file_rev_handler(voi
}
static svn_error_t *get_file_revs(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
svn_error_t *err, *write_err;
@@ -2293,7 +2293,7 @@ static svn_error_t *get_file_revs(svn_ra
}
static svn_error_t *lock(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
const char *path;
@@ -2325,7 +2325,7 @@ static svn_error_t *lock(svn_ra_svn_conn
}
static svn_error_t *lock_many(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
apr_array_header_t *path_revs;
@@ -2424,7 +2424,7 @@ static svn_error_t *lock_many(svn_ra_svn
}
static svn_error_t *unlock(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
const char *path, *token, *full_path;
@@ -2451,7 +2451,7 @@ static svn_error_t *unlock(svn_ra_svn_co
}
static svn_error_t *unlock_many(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
svn_boolean_t break_lock;
@@ -2538,7 +2538,7 @@ static svn_error_t *unlock_many(svn_ra_s
}
static svn_error_t *get_lock(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
const char *path;
@@ -2567,7 +2567,7 @@ static svn_error_t *get_lock(svn_ra_svn_
}
static svn_error_t *get_locks(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
const char *path;
@@ -2633,7 +2633,7 @@ static svn_error_t *replay_one_revision(
}
static svn_error_t *replay(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
svn_revnum_t rev, low_water_mark;
svn_boolean_t send_deltas;
@@ -2653,7 +2653,7 @@ static svn_error_t *replay(svn_ra_svn_co
}
static svn_error_t *replay_range(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- apr_array_header_t *params, void *baton)
+ const apr_array_header_t *params, void *baton)
{
svn_revnum_t start_rev, end_rev, rev, low_water_mark;
svn_boolean_t send_deltas;
@@ -2695,7 +2695,7 @@ static svn_error_t *replay_range(svn_ra_
static svn_error_t *
get_deleted_rev(svn_ra_svn_conn_t *conn,
apr_pool_t *pool,
- apr_array_header_t *params,
+ const apr_array_header_t *params,
void *baton)
{
server_baton_t *b = baton;
@@ -2810,7 +2810,7 @@ repos_path_valid(const char *path)
static svn_error_t *find_repos(const char *url, const char *root,
server_baton_t *b,
svn_ra_svn_conn_t *conn,
- apr_array_header_t *capabilities,
+ const apr_array_header_t *capabilities,
apr_pool_t *pool)
{
const char *path, *full_path, *repos_root, *fs_path;
Modified: subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_repos/repos-test.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_repos/repos-test.c Fri Mar 12 12:36:23 2010
@@ -2356,7 +2356,7 @@ static svn_error_t *
file_rev_handler(void *baton, const char *path, svn_revnum_t rev,
apr_hash_t *rev_props, svn_boolean_t result_of_merge,
svn_txdelta_window_handler_t *delta_handler,
- void **delta_baton, apr_array_header_t *prop_diffs,
+ void **delta_baton, const apr_array_header_t *prop_diffs,
apr_pool_t *pool)
{
apr_hash_t *ht = baton;
Modified: subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=922239&r1=922238&r2=922239&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c Fri Mar 12 12:36:23 2010
@@ -382,7 +382,7 @@ range_to_string(svn_merge_range_t *range
verified (e.g. "svn_rangelist_intersect"), while TYPE is a word
describing what the ranges being examined represent. */
static svn_error_t *
-verify_ranges_match(apr_array_header_t *actual_rangelist,
+verify_ranges_match(const apr_array_header_t *actual_rangelist,
svn_merge_range_t *expected_ranges, int nbr_expected,
const char *func_verified, const char *type,
apr_pool_t *pool)