Re: CVS update: MODIFIED: libsvn_wc ...

+1 on Greg's new error system; I think it's much better than the
solution Ben and I came up with. If no one has any objections, I'm
for removing the old code and getting rid of the build-time
conditional.

Greg described this to me in California some time ago, too, I just
forgot the solution. Glad _he_ didn't. :-)

-K

gstein@tigris.org writes:
> User: gstein
> Date: 01/06/13 02:10:37
>
> Modified: subversion/tests/libsvn_wc checkout-test.c commit-test.c
> Log:
> And the mother is back...
>
> Change svn_string_FUNC to svn_stringbuf_FUNC.
>
> Revision Changes Path
> 1.3 +1 -1 subversion/subversion/clients/cmdline/commit-cmd.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/clients/cmdline/commit-cmd.c.diff?r1=1.2&r2=1.3
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: commit-cmd.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/clients/cmdline/commit-cmd.c,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -b -r1.2 -r1.3
> --- commit-cmd.c 2001/06/08 09:01:02 1.2
> +++ commit-cmd.c 2001/06/13 09:10:31 1.3
> @@ -57,7 +57,7 @@
>
> /* Get the current working directory as an absolute path. */
> SVN_ERR (svn_path_get_absolute (&cur_dir,
> - svn_string_create (".", pool),
> + svn_stringbuf_create (".", pool),
> pool));
>
> /* Condense the targets (like commit does)... */
>
>
>
> 1.3 +1 -1 subversion/subversion/clients/cmdline/diff.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/clients/cmdline/diff.c.diff?r1=1.2&r2=1.3
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: diff.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/clients/cmdline/diff.c,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -b -r1.2 -r1.3
> --- diff.c 2001/06/08 09:01:02 1.2
> +++ diff.c 2001/06/13 09:10:31 1.3
> @@ -78,7 +78,7 @@
> printf( "Index: %s\n", path->data );
> printf( "===================================================================\n" );
>
> - err = svn_wc_run_cmd_in_directory (svn_string_create (".", pool),
> + err = svn_wc_run_cmd_in_directory (svn_stringbuf_create (".", pool),
> SVN_CLIENT_DIFF,
> args,
> NULL, outhandle, NULL, pool);
>
>
>
> 1.3 +2 -2 subversion/subversion/clients/cmdline/import-cmd.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/clients/cmdline/import-cmd.c.diff?r1=1.2&r2=1.3
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: import-cmd.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/clients/cmdline/import-cmd.c,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -b -r1.2 -r1.3
> --- import-cmd.c 2001/06/08 09:01:02 1.2
> +++ import-cmd.c 2001/06/13 09:10:31 1.3
> @@ -93,7 +93,7 @@
>
> /* Get a local path. */
> if (targets->nelts < 2)
> - path = svn_string_create (".", pool);
> + path = svn_stringbuf_create (".", pool);
> else
> path = ((svn_stringbuf_t **) (targets->elts))[1];
>
> @@ -102,7 +102,7 @@
> it normally does. This leads to very confusing output. Instead,
> for consistency, it will print those paths being added in the
> repository, completely ignoring the local source. */
> - printpath = svn_string_create ("", pool);
> + printpath = svn_stringbuf_create ("", pool);
>
> /* Optionally get the dest entry name. */
> if (targets->nelts < 3)
>
>
>
> 1.4 +3 -3 subversion/subversion/clients/cmdline/main.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/clients/cmdline/main.c.diff?r1=1.3&r2=1.4
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: main.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/clients/cmdline/main.c,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -b -r1.3 -r1.4
> --- main.c 2001/06/11 17:35:03 1.3
> +++ main.c 2001/06/13 09:10:31 1.4
> @@ -199,7 +199,7 @@
>
> switch (opt_id) {
> case 'm':
> - opt_state.message = svn_string_create (opt_arg, pool);
> + opt_state.message = svn_stringbuf_create (opt_arg, pool);
> break;
> case 'r':
> opt_state.revision = (svn_revnum_t) atoi (opt_arg);
> @@ -211,10 +211,10 @@
> opt_state.help = TRUE;
> break;
> case svn_cl__xml_file_opt:
> - opt_state.xml_file = svn_string_create (opt_arg, pool);
> + opt_state.xml_file = svn_stringbuf_create (opt_arg, pool);
> break;
> case 'd':
> - opt_state.target = svn_string_create (opt_arg, pool);
> + opt_state.target = svn_stringbuf_create (opt_arg, pool);
> break;
> case 'F':
> err = svn_string_from_file (&(opt_state.filedata), opt_arg, pool);
>
>
>
> 1.3 +1 -1 subversion/subversion/clients/cmdline/props.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/clients/cmdline/props.c.diff?r1=1.2&r2=1.3
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: props.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/clients/cmdline/props.c,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -b -r1.2 -r1.3
> --- props.c 2001/06/08 09:01:02 1.2
> +++ props.c 2001/06/13 09:10:31 1.3
> @@ -46,7 +46,7 @@
>
> /* Get next property */
> apr_hash_this (hi, &key, &klen, &val);
> - propkey = svn_string_ncreate (key, klen, pool);
> + propkey = svn_stringbuf_ncreate (key, klen, pool);
> propval = (svn_stringbuf_t *) val;
>
> printf ("%s : %s\n", propkey->data, propval->data);
>
>
>
> 1.3 +1 -1 subversion/subversion/clients/cmdline/status.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/clients/cmdline/status.c.diff?r1=1.2&r2=1.3
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: status.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/clients/cmdline/status.c,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -b -r1.2 -r1.3
> --- status.c 2001/06/08 09:01:02 1.2
> +++ status.c 2001/06/13 09:10:31 1.3
> @@ -149,7 +149,7 @@
> path = (const char *) item->key;
> status = (svn_wc_status_t *) item->data;
>
> - svn_cl__print_status (svn_string_create (path, pool), status);
> + svn_cl__print_status (svn_stringbuf_create (path, pool), status);
> }
> }
>
>
>
>
> 1.4 +7 -7 subversion/subversion/clients/cmdline/trace-commit.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/clients/cmdline/trace-commit.c.diff?r1=1.3&r2=1.4
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: trace-commit.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/clients/cmdline/trace-commit.c,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -b -r1.3 -r1.4
> --- trace-commit.c 2001/06/11 02:22:08 1.3
> +++ trace-commit.c 2001/06/13 09:10:31 1.4
> @@ -75,7 +75,7 @@
> {
> struct dir_baton *d = parent_baton;
>
> - svn_stringbuf_t *printable_name = svn_string_dup (d->path, d->edit_baton->pool);
> + svn_stringbuf_t *printable_name = svn_stringbuf_dup (d->path, d->edit_baton->pool);
> svn_path_add_component (printable_name, name, svn_path_local_style);
>
> printf ("Deleting %s\n", printable_name->data);
> @@ -96,7 +96,7 @@
>
> child_d->edit_baton = parent_d->edit_baton;
> child_d->parent_dir_baton = parent_d;
> - child_d->path = svn_string_dup (parent_d->path, child_d->edit_baton->pool);
> + child_d->path = svn_stringbuf_dup (parent_d->path, child_d->edit_baton->pool);
> svn_path_add_component (child_d->path, name, svn_path_local_style);
> child_d->added = TRUE;
>
> @@ -119,7 +119,7 @@
>
> child_d->edit_baton = parent_d->edit_baton;
> child_d->parent_dir_baton = parent_d;
> - child_d->path = svn_string_dup (parent_d->path, child_d->edit_baton->pool);
> + child_d->path = svn_stringbuf_dup (parent_d->path, child_d->edit_baton->pool);
> svn_path_add_component (child_d->path, name, svn_path_local_style);
>
> *child_baton = child_d;
> @@ -200,7 +200,7 @@
> = apr_pcalloc (parent_d->edit_baton->pool, sizeof (*child_fb));
>
> child_fb->parent_dir_baton = parent_d;
> - child_fb->path = svn_string_dup (parent_d->path, parent_d->edit_baton->pool);
> + child_fb->path = svn_stringbuf_dup (parent_d->path, parent_d->edit_baton->pool);
> svn_path_add_component (child_fb->path, name, svn_path_local_style);
> child_fb->added = TRUE;
>
> @@ -221,7 +221,7 @@
> = apr_pcalloc (parent_d->edit_baton->pool, sizeof (*child_fb));
>
> child_fb->parent_dir_baton = parent_d;
> - child_fb->path = svn_string_dup (parent_d->path, parent_d->edit_baton->pool);
> + child_fb->path = svn_stringbuf_dup (parent_d->path, parent_d->edit_baton->pool);
> svn_path_add_component (child_fb->path, name, svn_path_local_style);
>
> *file_baton = child_fb;
> @@ -266,11 +266,11 @@
>
> /* kff todo: hmm, that's a bit of a kluge now, isn't it? */
> if ((initial_path == NULL) || (initial_path->len == 0))
> - initial_path = svn_string_create (".", pool);
> + initial_path = svn_stringbuf_create (".", pool);
>
> /* Set up the edit context. */
> eb->pool = svn_pool_create (pool);
> - eb->initial_path = svn_string_dup (initial_path, eb->pool);
> + eb->initial_path = svn_stringbuf_dup (initial_path, eb->pool);
>
> /* Set up the editor. */
> trace_editor->replace_root = replace_root;
>
>
>
> 1.4 +6 -6 subversion/subversion/clients/cmdline/trace-update.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/clients/cmdline/trace-update.c.diff?r1=1.3&r2=1.4
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: trace-update.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/clients/cmdline/trace-update.c,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -b -r1.3 -r1.4
> --- trace-update.c 2001/06/08 21:31:20 1.3
> +++ trace-update.c 2001/06/13 09:10:31 1.4
> @@ -74,7 +74,7 @@
> {
> struct dir_baton *d = parent_baton;
>
> - svn_stringbuf_t *printable_name = svn_string_dup (d->path, d->edit_baton->pool);
> + svn_stringbuf_t *printable_name = svn_stringbuf_dup (d->path, d->edit_baton->pool);
> svn_path_add_component (printable_name, name, svn_path_local_style);
>
> printf ("D %s\n", printable_name->data);
> @@ -95,7 +95,7 @@
>
> child_d->edit_baton = parent_d->edit_baton;
> child_d->parent_dir_baton = parent_d;
> - child_d->path = svn_string_dup (parent_d->path, child_d->edit_baton->pool);
> + child_d->path = svn_stringbuf_dup (parent_d->path, child_d->edit_baton->pool);
> svn_path_add_component (child_d->path, name, svn_path_local_style);
> child_d->added = TRUE;
>
> @@ -118,7 +118,7 @@
>
> child_d->edit_baton = parent_d->edit_baton;
> child_d->parent_dir_baton = parent_d;
> - child_d->path = svn_string_dup (parent_d->path, child_d->edit_baton->pool);
> + child_d->path = svn_stringbuf_dup (parent_d->path, child_d->edit_baton->pool);
> svn_path_add_component (child_d->path, name, svn_path_local_style);
>
> *child_baton = child_d;
> @@ -281,7 +281,7 @@
> = apr_pcalloc (parent_d->edit_baton->pool, sizeof (*child_fb));
>
> child_fb->parent_dir_baton = parent_d;
> - child_fb->path = svn_string_dup (parent_d->path, parent_d->edit_baton->pool);
> + child_fb->path = svn_stringbuf_dup (parent_d->path, parent_d->edit_baton->pool);
> svn_path_add_component (child_fb->path, name, svn_path_local_style);
> child_fb->added = TRUE;
>
> @@ -302,7 +302,7 @@
> = apr_pcalloc (parent_d->edit_baton->pool, sizeof (*child_fb));
>
> child_fb->parent_dir_baton = parent_d;
> - child_fb->path = svn_string_dup (parent_d->path, parent_d->edit_baton->pool);
> + child_fb->path = svn_stringbuf_dup (parent_d->path, parent_d->edit_baton->pool);
> svn_path_add_component (child_fb->path, name, svn_path_local_style);
>
> *file_baton = child_fb;
> @@ -355,7 +355,7 @@
>
> /* Set up the edit context. */
> eb->pool = svn_pool_create (pool);
> - eb->initial_path = svn_string_dup (initial_path, eb->pool);
> + eb->initial_path = svn_stringbuf_dup (initial_path, eb->pool);
>
> /* Set up the editor. */
> trace_editor->replace_root = replace_root;
>
>
>
> 1.4 +2 -2 subversion/subversion/clients/cmdline/util.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/clients/cmdline/util.c.diff?r1=1.3&r2=1.4
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: util.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/clients/cmdline/util.c,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -b -r1.3 -r1.4
> --- util.c 2001/06/08 09:01:02 1.3
> +++ util.c 2001/06/13 09:10:32 1.4
> @@ -47,7 +47,7 @@
> apr_pool_t *pool)
> {
> (*((svn_stringbuf_t **) apr_array_push (array)))
> - = svn_string_create (str, pool);
> + = svn_stringbuf_create (str, pool);
> }
>
> /* Return the entry in svn_cl__cmd_table whose name matches CMD_NAME,
> @@ -146,7 +146,7 @@
>
> for (; os->ind < os->argc; os->ind++)
> {
> - svn_stringbuf_t *target = svn_string_create (os->argv[os->ind], pool);
> + svn_stringbuf_t *target = svn_stringbuf_create (os->argv[os->ind], pool);
> svn_stringbuf_t *basename = svn_path_last_component (target,
> svn_path_local_style,
> pool);
>
>
>
> 1.50 +20 -20 subversion/subversion/include/svn_string.h
>
> http://subversion.tigris.org/source/browse/subversion/subversion/include/svn_string.h.diff?r1=1.49&r2=1.50
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: svn_string.h
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/include/svn_string.h,v
> retrieving revision 1.49
> retrieving revision 1.50
> diff -u -b -r1.49 -r1.50
> --- svn_string.h 2001/06/12 15:55:25 1.49
> +++ svn_string.h 2001/06/13 09:10:32 1.50
> @@ -85,22 +85,22 @@
> 
> /* Create a new bytestring containing a C string (null-terminated), or
> containing a generic string of bytes (NON-null-terminated) */
> -svn_stringbuf_t * svn_string_create (const char *cstring,
> +svn_stringbuf_t * svn_stringbuf_create (const char *cstring,
> apr_pool_t *pool);
> -svn_stringbuf_t * svn_string_ncreate (const char *bytes,
> +svn_stringbuf_t * svn_stringbuf_ncreate (const char *bytes,
> const apr_size_t size,
> apr_pool_t *pool);
>
> /* Create a new bytestring by formatting CSTRING (null-terminated)
> from varargs, which are as appropriate for apr_psprintf. */
> -svn_stringbuf_t *svn_string_createf (apr_pool_t *pool,
> +svn_stringbuf_t *svn_stringbuf_createf (apr_pool_t *pool,
> const char *fmt,
> ...)
> __attribute__ ((format (printf, 2, 3)));
>
> /* Create a new bytestring by formatting CSTRING (null-terminated)
> - from a va_list (see svn_string_createf). */
> -svn_stringbuf_t *svn_string_createv (apr_pool_t *pool,
> + from a va_list (see svn_stringbuf_createf). */
> +svn_stringbuf_t *svn_stringbuf_createv (apr_pool_t *pool,
> const char *fmt,
> va_list ap)
> __attribute__ ((format (printf, 2, 0)));
> @@ -108,59 +108,59 @@
> /* Make sure that the string STR has at least MINIMUM_SIZE bytes of
> space available in the memory block. (MINIMUM_SIZE should include
> space for the terminating null character.) */
> -void svn_string_ensure (svn_stringbuf_t *str,
> +void svn_stringbuf_ensure (svn_stringbuf_t *str,
> apr_size_t minimum_size);
>
> /* Set a bytestring STR to VALUE */
> -void svn_string_set (svn_stringbuf_t *str, const char *value);
> +void svn_stringbuf_set (svn_stringbuf_t *str, const char *value);
>
> /* Set a bytestring STR to empty (0 length). */
> -void svn_string_setempty (svn_stringbuf_t *str);
> +void svn_stringbuf_setempty (svn_stringbuf_t *str);
>
> /* Return true if a bytestring is empty (has length zero). */
> -svn_boolean_t svn_string_isempty (const svn_stringbuf_t *str);
> +svn_boolean_t svn_stringbuf_isempty (const svn_stringbuf_t *str);
>
> /* Chop NBYTES bytes off end of STR, but not more than STR->len. */
> -void svn_string_chop (svn_stringbuf_t *str, apr_size_t bytes);
> +void svn_stringbuf_chop (svn_stringbuf_t *str, apr_size_t bytes);
>
> /* Fill bytestring STR with character C. */
> -void svn_string_fillchar (svn_stringbuf_t *str, const unsigned char c);
> +void svn_stringbuf_fillchar (svn_stringbuf_t *str, const unsigned char c);
>
> /* Append either a string of bytes, an svn_stringbuf_t, or a C-string
> onto TARGETSTR. reallocs() if necessary. TARGETSTR is affected,
> nothing else is. */
> -void svn_string_appendbytes (svn_stringbuf_t *targetstr,
> +void svn_stringbuf_appendbytes (svn_stringbuf_t *targetstr,
> const char *bytes,
> const apr_size_t count);
> -void svn_string_appendstr (svn_stringbuf_t *targetstr,
> +void svn_stringbuf_appendstr (svn_stringbuf_t *targetstr,
> const svn_stringbuf_t *appendstr);
> -void svn_string_appendcstr (svn_stringbuf_t *targetstr,
> +void svn_stringbuf_appendcstr (svn_stringbuf_t *targetstr,
> const char *cstr);
>
> /* Return a duplicate of ORIGNAL_STRING. */
> -svn_stringbuf_t *svn_string_dup (const svn_stringbuf_t *original_string,
> +svn_stringbuf_t *svn_stringbuf_dup (const svn_stringbuf_t *original_string,
> apr_pool_t *pool);
>
>
> /* Return TRUE iff STR1 and STR2 have identical length and data. */
> -svn_boolean_t svn_string_compare (const svn_stringbuf_t *str1,
> +svn_boolean_t svn_stringbuf_compare (const svn_stringbuf_t *str1,
> const svn_stringbuf_t *str2);
>
> /** convenience routines **/
>
> /* Return offset of first non-whitespace character in STR, or -1 if none. */
> -apr_size_t svn_string_first_non_whitespace (const svn_stringbuf_t *str);
> +apr_size_t svn_stringbuf_first_non_whitespace (const svn_stringbuf_t *str);
>
> /* Strips whitespace from both sides of STR (modified in place). */
> -void svn_string_strip_whitespace (svn_stringbuf_t *str);
> +void svn_stringbuf_strip_whitespace (svn_stringbuf_t *str);
>
> /* Return position of last occurrence of CHAR in STR, or return
> STR->len if no occurrence. */
> -apr_size_t svn_string_find_char_backward (const svn_stringbuf_t *str, char ch);
> +apr_size_t svn_stringbuf_find_char_backward (const svn_stringbuf_t *str, char ch);
>
> /* Chop STR back to CHAR, inclusive. Returns number of chars
> chopped, so if no such CHAR in STR, chops nothing and returns 0. */
> -apr_size_t svn_string_chop_back_to_char (svn_stringbuf_t *str, char ch);
> +apr_size_t svn_stringbuf_chop_back_to_char (svn_stringbuf_t *str, char ch);
>
> #ifdef __cplusplus
> }
>
>
>
> 1.17 +3 -3 subversion/subversion/libsvn_client/add.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_client/add.c.diff?r1=1.16&r2=1.17
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: add.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_client/add.c,v
> retrieving revision 1.16
> retrieving revision 1.17
> diff -u -b -r1.16 -r1.17
> --- add.c 2001/06/08 21:31:20 1.16
> +++ add.c 2001/06/13 09:10:32 1.17
> @@ -40,7 +40,7 @@
> apr_pool_t *subpool;
>
> /* Add this directory to revision control. */
> - SVN_ERR (svn_wc_add_directory (svn_string_create (dirname, pool),
> + SVN_ERR (svn_wc_add_directory (svn_stringbuf_create (dirname, pool),
> pool));
>
> /* Create a subpool for iterative memory control. */
> @@ -65,10 +65,10 @@
> continue;
>
> /* Construct the full path of the entry. */
> - fullpath = svn_string_create (dirname, subpool);
> + fullpath = svn_stringbuf_create (dirname, subpool);
> svn_path_add_component
> (fullpath,
> - svn_string_create (this_entry.name, subpool),
> + svn_stringbuf_create (this_entry.name, subpool),
> svn_path_local_style);
>
> if (this_entry.filetype == APR_DIR)
>
>
>
> 1.17 +1 -1 subversion/subversion/libsvn_client/apply_edits.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_client/apply_edits.c.diff?r1=1.16&r2=1.17
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: apply_edits.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_client/apply_edits.c,v
> retrieving revision 1.16
> retrieving revision 1.17
> diff -u -b -r1.16 -r1.17
> --- apply_edits.c 2001/06/08 09:01:03 1.16
> +++ apply_edits.c 2001/06/13 09:10:32 1.17
> @@ -50,7 +50,7 @@
> /* If not given an ancestor path, we will (for the time being)
> simply create an empty one. */
> if (! ancestor_path)
> - ancestor_path = svn_string_create ("", pool);
> + ancestor_path = svn_stringbuf_create ("", pool);
>
> if (is_update)
> {
>
>
>
> 1.50 +5 -5 subversion/subversion/libsvn_client/commit.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_client/commit.c.diff?r1=1.49&r2=1.50
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: commit.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_client/commit.c,v
> retrieving revision 1.49
> retrieving revision 1.50
> diff -u -b -r1.49 -r1.50
> --- commit.c 2001/06/12 17:41:27 1.49
> +++ commit.c 2001/06/13 09:10:32 1.50
> @@ -143,14 +143,14 @@
> APR_STATUS_IS_SUCCESS (apr_err);
> apr_err = apr_dir_read (&this_entry, APR_FINFO_NORM, dir))
> {
> - svn_stringbuf_t *new_path = svn_string_dup (path, subpool);
> + svn_stringbuf_t *new_path = svn_stringbuf_dup (path, subpool);
> svn_path_add_component (new_path,
> - svn_string_create (this_entry.name, subpool),
> + svn_stringbuf_create (this_entry.name, subpool),
> svn_path_local_style);
>
> if (this_entry.filetype == APR_DIR)
> {
> - svn_stringbuf_t *name = svn_string_create (this_entry.name, subpool);
> + svn_stringbuf_t *name = svn_stringbuf_create (this_entry.name, subpool);
> void *this_dir_baton;
>
> /* Skip entries for this dir and its parent.
> @@ -185,7 +185,7 @@
> SVN_ERR (import_file (editor,
> dir_baton,
> new_path,
> - svn_string_create (this_entry.name, subpool),
> + svn_stringbuf_create (this_entry.name, subpool),
> subpool));
> }
> else
> @@ -459,7 +459,7 @@
>
> /* Make sure our log message at least exists, even if empty. */
> if (! log_msg)
> - log_msg = svn_string_create ("", pool);
> + log_msg = svn_stringbuf_create ("", pool);
>
> /* Get the RA vtable that matches URL. */
> SVN_ERR (svn_ra_init_ra_libs (&ra_baton, pool));
>
>
>
> 1.14 +1 -1 subversion/subversion/libsvn_client/status.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_client/status.c.diff?r1=1.13&r2=1.14
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: status.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_client/status.c,v
> retrieving revision 1.13
> retrieving revision 1.14
> diff -u -b -r1.13 -r1.14
> --- status.c 2001/06/08 09:01:03 1.13
> +++ status.c 2001/06/13 09:10:32 1.14
> @@ -83,7 +83,7 @@
> svn_revnum_t latest_revnum;
>
> /* Open an RA session to URL, get latest revnum, close session. */
> - SVN_ERR (ra_lib->open (&session, svn_string_create (URL, pool), pool));
> + SVN_ERR (ra_lib->open (&session, svn_stringbuf_create (URL, pool), pool));
> SVN_ERR (ra_lib->get_latest_revnum (session, &latest_revnum));
> SVN_ERR (ra_lib->close (session));
>
>
>
>
> 1.20 +1 -1 subversion/subversion/libsvn_client/update.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_client/update.c.diff?r1=1.19&r2=1.20
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: update.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_client/update.c,v
> retrieving revision 1.19
> retrieving revision 1.20
> diff -u -b -r1.19 -r1.20
> --- update.c 2001/06/08 09:01:03 1.19
> +++ update.c 2001/06/13 09:10:32 1.20
> @@ -76,7 +76,7 @@
> "svn_client_update: %s is not under revision control",
> path->data);
>
> - URL = svn_string_create (entry->ancestor->data, pool);
> + URL = svn_stringbuf_create (entry->ancestor->data, pool);
>
> /* The following is an ugly kludge. In order to let the RA layer
> know the difference between updating entry 'Z' in dir 'X/Y' and
>
>
>
> 1.25 +8 -8 subversion/subversion/libsvn_delta/svndiff.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_delta/svndiff.c.diff?r1=1.24&r2=1.25
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: svndiff.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_delta/svndiff.c,v
> retrieving revision 1.24
> retrieving revision 1.25
> diff -u -b -r1.24 -r1.25
> --- svndiff.c 2001/06/08 21:31:21 1.24
> +++ svndiff.c 2001/06/13 09:10:33 1.25
> @@ -90,7 +90,7 @@
> char buf[128], *p;
>
> p = encode_int (buf, val);
> - svn_string_appendbytes (header, buf, p - buf);
> + svn_stringbuf_appendbytes (header, buf, p - buf);
> }
>
>
> @@ -99,8 +99,8 @@
> {
> struct encoder_baton *eb = baton;
> apr_pool_t *pool = svn_pool_create (eb->pool);
> - svn_stringbuf_t *instructions = svn_string_create ("", pool);
> - svn_stringbuf_t *header = svn_string_create ("", pool);
> + svn_stringbuf_t *instructions = svn_stringbuf_create ("", pool);
> + svn_stringbuf_t *header = svn_stringbuf_create ("", pool);
> char ibuf[128], *ip;
> svn_txdelta_op_t *op;
> svn_error_t *err;
> @@ -154,7 +154,7 @@
> ip = encode_int (ip + 1, op->length);
> if (op->action_code != svn_txdelta_new)
> ip = encode_int (ip, op->offset);
> - svn_string_appendbytes (instructions, ibuf, ip - ibuf);
> + svn_stringbuf_appendbytes (instructions, ibuf, ip - ibuf);
> }
>
> /* Encode the header. */
> @@ -373,7 +373,7 @@
> }
>
> /* Concatenate the old with the new. */
> - svn_string_appendbytes (db->buffer, buffer, *len);
> + svn_stringbuf_appendbytes (db->buffer, buffer, *len);
>
> /* Read the header, if we have enough bytes for that. */
> p = (const unsigned char *) db->buffer->data;
> @@ -448,7 +448,7 @@
> }
> }
> window->new_data
> - = svn_string_ncreate ((const char *) p, newlen, db->subpool);
> + = svn_stringbuf_ncreate ((const char *) p, newlen, db->subpool);
> window->pool = db->subpool;
>
> /* Send it off. */
> @@ -459,7 +459,7 @@
> db->subpool = svn_pool_create (db->pool);
> p += newlen;
> remaining = db->buffer->data + db->buffer->len - (const char *) p;
> - db->buffer = svn_string_ncreate ((const char *) p, remaining, db->subpool);
> + db->buffer = svn_stringbuf_ncreate ((const char *) p, remaining, db->subpool);
>
> /* Remember the offset and length of the source view for next time. */
> db->last_sview_offset = sview_offset;
> @@ -503,7 +503,7 @@
> db->consumer_baton = handler_baton;
> db->pool = subpool;
> db->subpool = svn_pool_create (subpool);
> - db->buffer = svn_string_create ("", db->subpool);
> + db->buffer = svn_stringbuf_create ("", db->subpool);
> db->last_sview_offset = 0;
> db->last_sview_len = 0;
> db->header_bytes = 0;
>
>
>
> 1.35 +2 -2 subversion/subversion/libsvn_delta/text_delta.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_delta/text_delta.c.diff?r1=1.34&r2=1.35
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: text_delta.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_delta/text_delta.c,v
> retrieving revision 1.34
> retrieving revision 1.35
> diff -u -b -r1.34 -r1.35
> --- text_delta.c 2001/06/08 21:31:21 1.34
> +++ text_delta.c 2001/06/13 09:10:33 1.35
> @@ -77,7 +77,7 @@
> window->num_ops = 0;
> window->ops_size = 0;
> window->ops = NULL;
> - window->new_data = svn_string_create ("", subpool);
> + window->new_data = svn_stringbuf_create ("", subpool);
> window->pool = subpool;
> return window;
> }
> @@ -127,7 +127,7 @@
> op->action_code = opcode;
> op->offset = window->new_data->len;
> op->length = length;
> - svn_string_appendbytes (window->new_data, new_data, length);
> + svn_stringbuf_appendbytes (window->new_data, new_data, length);
> break;
> default:
> assert (!"unknown delta op.");
>
>
>
> 1.6 +6 -6 subversion/subversion/libsvn_delta/track_editor.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_delta/track_editor.c.diff?r1=1.5&r2=1.6
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: track_editor.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_delta/track_editor.c,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -b -r1.5 -r1.6
> --- track_editor.c 2001/06/08 09:01:03 1.5
> +++ track_editor.c 2001/06/13 09:10:33 1.6
> @@ -135,7 +135,7 @@
>
> child_d->edit_baton = parent_d->edit_baton;
> child_d->parent_dir_baton = parent_d;
> - child_d->path = svn_string_dup (parent_d->path, child_d->edit_baton->pool);
> + child_d->path = svn_stringbuf_dup (parent_d->path, child_d->edit_baton->pool);
> svn_path_add_component (child_d->path, name, svn_path_local_style);
>
> store_path (child_d->path, parent_d->edit_baton);
> @@ -159,7 +159,7 @@
>
> child_d->edit_baton = parent_d->edit_baton;
> child_d->parent_dir_baton = parent_d;
> - child_d->path = svn_string_dup (parent_d->path, child_d->edit_baton->pool);
> + child_d->path = svn_stringbuf_dup (parent_d->path, child_d->edit_baton->pool);
> svn_path_add_component (child_d->path, name, svn_path_local_style);
>
> *child_baton = child_d;
> @@ -182,7 +182,7 @@
> = apr_pcalloc (parent_d->edit_baton->pool, sizeof (*child_fb));
>
> child_fb->parent_dir_baton = parent_d;
> - child_fb->path = svn_string_dup (parent_d->path, parent_d->edit_baton->pool);
> + child_fb->path = svn_stringbuf_dup (parent_d->path, parent_d->edit_baton->pool);
> svn_path_add_component (child_fb->path, name, svn_path_local_style);
>
> store_path (child_fb->path, parent_d->edit_baton);
> @@ -205,7 +205,7 @@
> = apr_pcalloc (parent_d->edit_baton->pool, sizeof (*child_fb));
>
> child_fb->parent_dir_baton = parent_d;
> - child_fb->path = svn_string_dup (parent_d->path, parent_d->edit_baton->pool);
> + child_fb->path = svn_stringbuf_dup (parent_d->path, parent_d->edit_baton->pool);
> svn_path_add_component (child_fb->path, name, svn_path_local_style);
>
> *file_baton = child_fb;
> @@ -219,7 +219,7 @@
> void *parent_baton)
> {
> struct dir_baton *parent_d = parent_baton;
> - svn_stringbuf_t *path = svn_string_dup (parent_d->path,
> + svn_stringbuf_t *path = svn_stringbuf_dup (parent_d->path,
> parent_d->edit_baton->pool);
> svn_path_add_component (path, name, svn_path_local_style);
>
> @@ -349,7 +349,7 @@
>
> /* Set up the edit baton. */
> eb->pool = pool;
> - eb->initial_path = svn_string_create ("", pool);
> + eb->initial_path = svn_stringbuf_create ("", pool);
> eb->array = array;
> eb->new_rev = new_rev;
> eb->bump_func = bump_func;
>
>
>
> 1.40 +7 -7 subversion/subversion/libsvn_delta/xml_output.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_delta/xml_output.c.diff?r1=1.39&r2=1.40
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: xml_output.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_delta/xml_output.c,v
> retrieving revision 1.39
> retrieving revision 1.40
> diff -u -b -r1.39 -r1.40
> --- xml_output.c 2001/06/08 21:31:21 1.39
> +++ xml_output.c 2001/06/13 09:10:33 1.40
> @@ -152,7 +152,7 @@
> static svn_stringbuf_t *
> get_to_elem (struct edit_baton *eb, enum elemtype elem, apr_pool_t *pool)
> {
> - svn_stringbuf_t *str = svn_string_create ("", pool);
> + svn_stringbuf_t *str = svn_stringbuf_create ("", pool);
> struct file_baton *fb;
>
> /* Unwind. Start from the leaves and go back as far as necessary. */
> @@ -176,7 +176,7 @@
> callers are using temporary pools anyway. */
> fb->txdelta_id = eb->txdelta_id_counter++;
> sprintf (buf, "%d", fb->txdelta_id);
> - idstr = svn_string_create (buf, pool);
> + idstr = svn_stringbuf_create (buf, pool);
> svn_xml_make_open_tag (&str, pool, svn_xml_self_closing,
> SVN_DELTA__XML_TAG_TEXT_DELTA_REF,
> SVN_DELTA__XML_ATTR_ID, idstr, NULL);
> @@ -254,7 +254,7 @@
> }
> if (SVN_IS_VALID_REVNUM(base_revision))
> {
> - svn_stringbuf_t *buf = svn_string_createf (pool, "%lu",
> + svn_stringbuf_t *buf = svn_stringbuf_createf (pool, "%lu",
> (unsigned long) base_revision);
> if (addreplace == elem_add)
> {
> @@ -340,7 +340,7 @@
> {
> svn_stringbuf_t *br_buf;
>
> - br_buf = svn_string_createf (pool, "%lu",
> + br_buf = svn_stringbuf_createf (pool, "%lu",
> (unsigned long) base_revision);
> apr_hash_set (att, SVN_DELTA__XML_ATTR_BASE_REV,
> strlen(SVN_DELTA__XML_ATTR_BASE_REV), br_buf);
> @@ -349,7 +349,7 @@
> {
> svn_stringbuf_t *tr_buf;
>
> - tr_buf = svn_string_createf (pool, "%lu",
> + tr_buf = svn_stringbuf_createf (pool, "%lu",
> (unsigned long) eb->target_revision);
> apr_hash_set (att, SVN_DELTA__XML_ATTR_TARGET_REV,
> strlen(SVN_DELTA__XML_ATTR_TARGET_REV), tr_buf);
> @@ -556,12 +556,12 @@
> sprintf(buf, "%d", fb->txdelta_id);
> apr_hash_set (att, SVN_DELTA__XML_ATTR_ID,
> strlen(SVN_DELTA__XML_ATTR_ID),
> - svn_string_create (buf, pool));
> + svn_stringbuf_create (buf, pool));
> }
> #ifdef QUOPRINT_SVNDIFFS
> apr_hash_set (att, SVN_DELTA__XML_ATTR_ENCODING,
> strlen(SVN_DELTA__XML_ATTR_ENCODING),
> - svn_string_create ("quoted-printable", pool));
> + svn_stringbuf_create ("quoted-printable", pool));
> #endif
> svn_xml_make_open_tag_hash (&str, pool, svn_xml_protect_pcdata,
> SVN_DELTA__XML_TAG_TEXT_DELTA, att);
>
>
>
> 1.157 +19 -19 subversion/subversion/libsvn_delta/xml_parse.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_delta/xml_parse.c.diff?r1=1.156&r2=1.157
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: xml_parse.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_delta/xml_parse.c,v
> retrieving revision 1.156
> retrieving revision 1.157
> diff -u -b -r1.156 -r1.157
> --- xml_parse.c 2001/06/08 21:31:21 1.156
> +++ xml_parse.c 2001/06/13 09:10:33 1.157
> @@ -153,7 +153,7 @@
> */
>
> frame->ancestor_path
> - = svn_string_dup (p->ancestor_path, pool);
> + = svn_stringbuf_dup (p->ancestor_path, pool);
> svn_path_add_component (frame->ancestor_path, this_name,
> svn_path_repos_style);
> }
> @@ -248,7 +248,7 @@
> (SVN_ERR_MALFORMED_XML, 0, NULL, digger->pool,
> "check_dirent_namespace: parent frame has no namespace hash.");
>
> - if ((frame->name == NULL) || (svn_string_isempty (frame->name)))
> + if ((frame->name == NULL) || (svn_stringbuf_isempty (frame->name)))
> return
> svn_error_create
> (SVN_ERR_MALFORMED_XML, 0,
> @@ -449,7 +449,7 @@
> attributes of the current <dir> tag. */
> ancestor = svn_xml_get_attr_value (SVN_DELTA__XML_ATTR_BASE_PATH, atts);
> if (ancestor)
> - youngest_frame->ancestor_path = svn_string_create (ancestor, digger->pool);
> + youngest_frame->ancestor_path = svn_stringbuf_create (ancestor, digger->pool);
> ver = svn_xml_get_attr_value (SVN_DELTA__XML_ATTR_BASE_REV, atts);
> if (ver)
> youngest_frame->ancestor_revision = atoi (ver);
> @@ -535,7 +535,7 @@
> attributes of the current <dir> tag. */
> ancestor = svn_xml_get_attr_value (SVN_DELTA__XML_ATTR_BASE_PATH, atts);
> if (ancestor)
> - youngest_frame->ancestor_path = svn_string_create (ancestor, digger->pool);
> + youngest_frame->ancestor_path = svn_stringbuf_create (ancestor, digger->pool);
> ver = svn_xml_get_attr_value (SVN_DELTA__XML_ATTR_BASE_REV, atts);
> if (ver)
> youngest_frame->ancestor_revision = atoi (ver);
> @@ -753,8 +753,8 @@
> apr_pcalloc (digger->pool,
> sizeof (*(digger->current_propdelta)));
>
> - digger->current_propdelta->name = svn_string_create ("", digger->pool);
> - digger->current_propdelta->value = svn_string_create ("", digger->pool);
> + digger->current_propdelta->name = svn_stringbuf_create ("", digger->pool);
> + digger->current_propdelta->value = svn_stringbuf_create ("", digger->pool);
>
> /* Now figure out our context. Is this a propdelta on a file, dir,
> or dirent? */
> @@ -773,7 +773,7 @@
> /* Get the name of the file, too. */
> if (youngest_frame->previous->previous)
> digger->current_propdelta->entity_name =
> - svn_string_dup (youngest_frame->previous->previous->name,
> + svn_stringbuf_dup (youngest_frame->previous->previous->name,
> digger->pool);
> break;
> }
> @@ -783,7 +783,7 @@
> /* Get the name of the dir, too. */
> if (youngest_frame->previous->previous)
> digger->current_propdelta->entity_name =
> - svn_string_dup (youngest_frame->previous->previous->name,
> + svn_stringbuf_dup (youngest_frame->previous->previous->name,
> digger->pool);
> break;
> }
> @@ -808,7 +808,7 @@
> {
> if (digger->current_propdelta)
> digger->current_propdelta->name =
> - svn_string_dup (youngest_frame->name, digger->pool);
> + svn_stringbuf_dup (youngest_frame->name, digger->pool);
>
> return SVN_NO_ERROR;
> }
> @@ -837,7 +837,7 @@
>
> /* Finish filling out current propdelta. */
> digger->current_propdelta->name =
> - svn_string_dup (dir_name, digger->pool);
> + svn_stringbuf_dup (dir_name, digger->pool);
>
>
> return SVN_NO_ERROR;
> @@ -857,7 +857,7 @@
> if (! digger->current_propdelta)
> return SVN_NO_ERROR;
>
> - if (svn_string_isempty(digger->current_propdelta->value))
> + if (svn_stringbuf_isempty(digger->current_propdelta->value))
> value_string = NULL;
> else
> value_string = digger->current_propdelta->value;
> @@ -894,8 +894,8 @@
> /* Now that the change has been sent, clear its NAME and VALUE
> fields -- but not the KIND field, because more changes may be
> coming inside this <prop-delta> ! */
> - svn_string_setempty(digger->current_propdelta->name);
> - svn_string_setempty(digger->current_propdelta->value);
> + svn_stringbuf_setempty(digger->current_propdelta->name);
> + svn_stringbuf_setempty(digger->current_propdelta->value);
>
> return SVN_NO_ERROR;
> }
> @@ -945,7 +945,7 @@
> /* Set "name" field in frame, if there's any such attribute in ATTS */
> value = svn_xml_get_attr_value (SVN_DELTA__XML_ATTR_NAME, atts);
> if (value)
> - new_frame->name = svn_string_create (value, my_digger->pool);
> + new_frame->name = svn_stringbuf_create (value, my_digger->pool);
>
> /* If this is an add tag, it might contain copyfrom_path and
> copyfrom_revision attributes. Otherwise, it might just have the
> @@ -957,7 +957,7 @@
> ATTS */
> value = svn_xml_get_attr_value (SVN_DELTA__XML_ATTR_COPYFROM_PATH, atts);
> if (value)
> - new_frame->ancestor_path = svn_string_create (value, my_digger->pool);
> + new_frame->ancestor_path = svn_stringbuf_create (value, my_digger->pool);
>
> /* Set copyfrom revision in frame, if there's any such attribute
> in ATTS */
> @@ -971,7 +971,7 @@
> ATTS */
> value = svn_xml_get_attr_value (SVN_DELTA__XML_ATTR_BASE_PATH, atts);
> if (value)
> - new_frame->ancestor_path = svn_string_create (value, my_digger->pool);
> + new_frame->ancestor_path = svn_stringbuf_create (value, my_digger->pool);
>
> /* Set ancestor revision in frame, if there's any such attribute
> in ATTS */
> @@ -983,12 +983,12 @@
> /* Set "id" in frame, if there's any such attribute in ATTS */
> value = svn_xml_get_attr_value (SVN_DELTA__XML_ATTR_ID, atts);
> if (value)
> - new_frame->ref_id = svn_string_create (value, my_digger->pool);
> + new_frame->ref_id = svn_stringbuf_create (value, my_digger->pool);
>
> /* Set "encoding" in frame, if there's any such attribute in ATTS */
> value = svn_xml_get_attr_value (SVN_DELTA__XML_ATTR_ENCODING, atts);
> if (value)
> - new_frame->encoding = svn_string_create (value, my_digger->pool);
> + new_frame->encoding = svn_stringbuf_create (value, my_digger->pool);
>
> /* If this frame is a <delta-pkg>, it's the top-most frame, which
> holds the "base" ancestry info */
> @@ -1365,7 +1365,7 @@
> */
>
> if (digger->current_propdelta)
> - svn_string_appendbytes (digger->current_propdelta->value,
> + svn_stringbuf_appendbytes (digger->current_propdelta->value,
> data, length);
> }
>
>
>
>
> 1.97 +1 -1 subversion/subversion/libsvn_fs/dag.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_fs/dag.c.diff?r1=1.96&r2=1.97
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: dag.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_fs/dag.c,v
> retrieving revision 1.96
> retrieving revision 1.97
> diff -u -b -r1.96 -r1.97
> --- dag.c 2001/06/08 21:31:21 1.96
> +++ dag.c 2001/06/13 09:10:33 1.97
> @@ -136,7 +136,7 @@
> svn_stringbuf_t *parent_id_string
> = (parent_id
> ? svn_fs_unparse_id (parent_id, pool)
> - : svn_string_create ("", pool));
> + : svn_stringbuf_create ("", pool));
>
> svn_fs__prepend (svn_fs__mem_atom (parent_id_string->data,
> parent_id_string->len,
>
>
>
> 1.26 +2 -2 subversion/subversion/libsvn_fs/id.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_fs/id.c.diff?r1=1.25&r2=1.26
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: id.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_fs/id.c,v
> retrieving revision 1.25
> retrieving revision 1.26
> diff -u -b -r1.25 -r1.26
> --- id.c 2001/06/08 20:27:32 1.25
> +++ id.c 2001/06/13 09:10:33 1.26
> @@ -234,7 +234,7 @@
> svn_fs_unparse_id (const svn_fs_id_t *id,
> apr_pool_t *pool)
> {
> - svn_stringbuf_t *unparsed = svn_string_ncreate (0, 0, pool);
> + svn_stringbuf_t *unparsed = svn_stringbuf_ncreate (0, 0, pool);
> int i;
>
> for (i = 0; id[i] != -1; i++)
> @@ -248,7 +248,7 @@
> if (id[i + 1] != -1)
> buf[len++] = '.';
>
> - svn_string_appendbytes (unparsed, buf, len);
> + svn_stringbuf_appendbytes (unparsed, buf, len);
> }
>
> return unparsed;
>
>
>
> 1.11 +2 -2 subversion/subversion/libsvn_fs/proplist.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_fs/proplist.c.diff?r1=1.10&r2=1.11
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: proplist.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_fs/proplist.c,v
> retrieving revision 1.10
> retrieving revision 1.11
> diff -u -b -r1.10 -r1.11
> --- proplist.c 2001/06/11 10:49:05 1.10
> +++ proplist.c 2001/06/13 09:10:33 1.11
> @@ -40,7 +40,7 @@
>
> if (svn_fs__atom_matches_string (this_name, name))
> {
> - *value_p = svn_string_ncreate (this_value->data,
> + *value_p = svn_stringbuf_ncreate (this_value->data,
> this_value->len,
> pool);
> return SVN_NO_ERROR;
> @@ -80,7 +80,7 @@
> apr_hash_set (table,
> apr_pstrndup(pool, this_name->data, this_name->len),
> this_name->len,
> - svn_string_ncreate (this_value->data,
> + svn_stringbuf_ncreate (this_value->data,
> this_value->len,
> pool));
> }
>
>
>
> 1.32 +7 -7 subversion/subversion/libsvn_fs/skel.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_fs/skel.c.diff?r1=1.31&r2=1.32
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: skel.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_fs/skel.c,v
> retrieving revision 1.31
> retrieving revision 1.32
> diff -u -b -r1.31 -r1.32
> --- skel.c 2001/06/11 10:49:05 1.31
> +++ skel.c 2001/06/13 09:10:33 1.32
> @@ -349,7 +349,7 @@
> {
> /* Append an atom to STR. */
> if (use_implicit (skel))
> - svn_string_appendbytes (str, skel->data, skel->len);
> + svn_stringbuf_appendbytes (str, skel->data, skel->len);
> else
> {
> /* Append the length to STR. */
> @@ -362,11 +362,11 @@
>
> /* Make sure we have room for the length, the space, and the
> atom's contents. */
> - svn_string_ensure (str,
> + svn_stringbuf_ensure (str,
> str->len + length_len + 1 + skel->len);
> - svn_string_appendbytes (str, buf, length_len);
> + svn_stringbuf_appendbytes (str, buf, length_len);
> str->data[str->len++] = ' ';
> - svn_string_appendbytes (str, skel->data, skel->len);
> + svn_stringbuf_appendbytes (str, skel->data, skel->len);
> }
> }
> else
> @@ -375,7 +375,7 @@
> skel_t *child;
>
> /* Emit an opening parenthesis. */
> - svn_string_ensure (str, str->len + 1);
> + svn_stringbuf_ensure (str, str->len + 1);
> str->data[str->len++] = '(';
>
> /* Append each element. Emit a space between each pair of elements. */
> @@ -384,13 +384,13 @@
> unparse (child, str, pool);
> if (child->next)
> {
> - svn_string_ensure (str, str->len + 1);
> + svn_stringbuf_ensure (str, str->len + 1);
> str->data[str->len++] = ' ';
> }
> }
>
> /* Emit a closing parenthesis. */
> - svn_string_ensure (str, str->len + 1);
> + svn_stringbuf_ensure (str, str->len + 1);
> str->data[str->len++] = ')';
> }
>
>
>
>
> 1.77 +2 -2 subversion/subversion/libsvn_fs/tree.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_fs/tree.c.diff?r1=1.76&r2=1.77
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: tree.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_fs/tree.c,v
> retrieving revision 1.76
> retrieving revision 1.77
> diff -u -b -r1.76 -r1.77
> --- tree.c 2001/06/11 02:50:32 1.76
> +++ tree.c 2001/06/13 09:10:33 1.77
> @@ -2202,7 +2202,7 @@
> {
> txdelta_baton_t *tb = (txdelta_baton_t *) baton;
>
> - svn_string_appendbytes (tb->target_string, data, *len);
> + svn_stringbuf_appendbytes (tb->target_string, data, *len);
>
> return SVN_NO_ERROR;
> }
> @@ -2285,7 +2285,7 @@
> tb->root = root;
> tb->path = path;
> tb->pool = pool;
> - tb->target_string = svn_string_create ("", pool);
> + tb->target_string = svn_stringbuf_create ("", pool);
>
> /* Make a readable "source" stream out of the current contents of
> ROOT/PATH; obviously, this must done in the context of a
>
>
>
> 1.8 +2 -2 subversion/subversion/libsvn_ra/ra_loader.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_ra/ra_loader.c.diff?r1=1.7&r2=1.8
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: ra_loader.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_ra/ra_loader.c,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -b -r1.7 -r1.8
> --- ra_loader.c 2001/06/08 09:01:04 1.7
> +++ ra_loader.c 2001/06/13 09:10:33 1.8
> @@ -208,7 +208,7 @@
> {
> apr_hash_index_t *this;
> apr_hash_t *hash = ra_baton;
> - *descriptions = svn_string_create ("", pool);
> + *descriptions = svn_stringbuf_create ("", pool);
>
> for (this = apr_hash_first (hash); this; this = apr_hash_next (this))
> {
> @@ -226,7 +226,7 @@
>
> libdesc = apr_psprintf (pool, "* %s : handles '%s' schema\n (%s)\n",
> lib->name, keystr, lib->description);
> - svn_string_appendcstr (*descriptions, libdesc);
> + svn_stringbuf_appendcstr (*descriptions, libdesc);
> }
>
> return SVN_NO_ERROR;
>
>
>
> 1.56 +7 -7 subversion/subversion/libsvn_ra_dav/commit.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_ra_dav/commit.c.diff?r1=1.55&r2=1.56
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: commit.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_ra_dav/commit.c,v
> retrieving revision 1.55
> retrieving revision 1.56
> diff -u -b -r1.55 -r1.56
> --- commit.c 2001/06/12 17:41:27 1.55
> +++ commit.c 2001/06/13 09:10:33 1.56
> @@ -197,9 +197,9 @@
> property store. */
>
> /* ### damn, this is annoying to have to create strings */
> - svn_stringbuf_t * propname = svn_string_create(SVN_RA_DAV__LP_ACTIVITY_URL,
> + svn_stringbuf_t * propname = svn_stringbuf_create(SVN_RA_DAV__LP_ACTIVITY_URL,
> cc->ras->pool);
> - svn_stringbuf_t * path = svn_string_create(".", cc->ras->pool);
> + svn_stringbuf_t * path = svn_stringbuf_create(".", cc->ras->pool);
>
> /* get the URL where we should create activities */
> SVN_ERR( (*cc->get_func)(cc->close_baton, path, propname,
> @@ -210,7 +210,7 @@
> /* the property was there. return it. */
>
> /* ### urk. copy the thing to get a proper pool in there */
> - *activity_url = svn_string_dup(*activity_url, cc->ras->pool);
> + *activity_url = svn_stringbuf_dup(*activity_url, cc->ras->pool);
>
> return NULL;
> }
> @@ -268,7 +268,7 @@
> rsrc = apr_pcalloc(pool, sizeof(*rsrc));
> rsrc->url = apr_pstrcat(pool, parent->url, "/", name, NULL);
>
> - rsrc->local_path = svn_string_dup(parent->local_path, pool);
> + rsrc->local_path = svn_stringbuf_dup(parent->local_path, pool);
> svn_path_add_component_nts(rsrc->local_path, name, svn_path_local_style);
>
> /* If the resource was just created, then its WR appears under the
> @@ -444,7 +444,7 @@
> rsrc->url = cc->ras->root.path;
>
> /* ### should we use the WC symbol? (SVN_WC_ENTRY_THIS_DIR) */
> - rsrc->local_path = svn_string_create("", cc->ras->pool);
> + rsrc->local_path = svn_stringbuf_create("", cc->ras->pool);
>
> SVN_ERR( get_version_url(cc, rsrc) );
>
> @@ -751,7 +751,7 @@
> ### or a FILE*. since we are getting binary data, we must use a FILE*
> ### for now. isn't that special? */
> /* ### fucking svn_stringbuf_t */
> - path = svn_string_create(".svn_commit", subpool);
> + path = svn_stringbuf_create(".svn_commit", subpool);
> SVN_ERR( svn_io_open_unique_file(&baton->tmpfile, &baton->fname, path,
> ".ra_dav", subpool) );
>
> @@ -831,7 +831,7 @@
> cc = apr_pcalloc(ras->pool, sizeof(*cc));
> cc->ras = ras;
> cc->resources = apr_hash_make(ras->pool);
> - cc->vsn_url_name = svn_string_create(SVN_RA_DAV__LP_VSN_URL, ras->pool);
> + cc->vsn_url_name = svn_stringbuf_create(SVN_RA_DAV__LP_VSN_URL, ras->pool);
> cc->get_func = get_func;
> cc->set_func = set_func;
> cc->close_func = close_func;
>
>
>
> 1.59 +13 -13 subversion/subversion/libsvn_ra_dav/fetch.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_ra_dav/fetch.c.diff?r1=1.58&r2=1.59
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: fetch.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_ra_dav/fetch.c,v
> retrieving revision 1.58
> retrieving revision 1.59
> diff -u -b -r1.58 -r1.59
> --- fetch.c 2001/06/09 12:36:07 1.58
> +++ fetch.c 2001/06/13 09:10:33 1.59
> @@ -168,7 +168,7 @@
>
> static svn_stringbuf_t *my_basename(const char *url, apr_pool_t *pool)
> {
> - svn_stringbuf_t *s = svn_string_create(url, pool);
> + svn_stringbuf_t *s = svn_stringbuf_create(url, pool);
>
> svn_path_canonicalize(s, svn_path_url_style);
>
> @@ -191,7 +191,7 @@
> svn_error_t *err;
>
> /* store the version URL as a property */
> - svn_string_set(vuh->value, vsn_url);
> + svn_stringbuf_set(vuh->value, vsn_url);
> err = (*setter)(baton, vuh->name, vuh->value);
> if (err)
> return svn_error_quick_wrap(err,
> @@ -542,10 +542,10 @@
> PUSH_SUBDIR(subdirs, subdir);
>
> /* ### damn. gotta build a string. */
> - act_url_name = svn_string_create(SVN_RA_DAV__LP_ACTIVITY_URL, ras->pool);
> + act_url_name = svn_stringbuf_create(SVN_RA_DAV__LP_ACTIVITY_URL, ras->pool);
>
> /* prep the helper */
> - vuh.name = svn_string_create(SVN_RA_DAV__LP_VSN_URL, ras->pool);
> + vuh.name = svn_stringbuf_create(SVN_RA_DAV__LP_VSN_URL, ras->pool);
> vuh.value = MAKE_BUFFER(ras->pool);
>
> do
> @@ -833,7 +833,7 @@
> {
> name = get_attr(atts, "name");
> /* ### verify we got it. punt on error. */
> - svn_string_set(rb->namestr, name);
> + svn_stringbuf_set(rb->namestr, name);
>
> err = (*rb->editor->replace_directory)(rb->namestr,
> TOP_DIR(rb).baton, base,
> @@ -849,13 +849,13 @@
> case ELEM_add_directory:
> name = get_attr(atts, "name");
> /* ### verify we got it. punt on error. */
> - svn_string_set(rb->namestr, name);
> + svn_stringbuf_set(rb->namestr, name);
>
> att = get_attr(atts, "copyfrom-path");
> if (att != NULL)
> {
> cpath = rb->cpathstr;
> - svn_string_set(cpath, att);
> + svn_stringbuf_set(cpath, att);
>
> att = get_attr(atts, "copyfrom-rev");
> /* ### verify we got it. punt on error. */
> @@ -878,7 +878,7 @@
>
> name = get_attr(atts, "name");
> /* ### verify we got it. punt on error. */
> - svn_string_set(rb->namestr, name);
> + svn_stringbuf_set(rb->namestr, name);
>
> CHKERR( (*rb->editor->replace_file)(rb->namestr, TOP_DIR(rb).baton, base,
> &rb->file_baton) );
> @@ -887,13 +887,13 @@
> case ELEM_add_file:
> name = get_attr(atts, "name");
> /* ### verify we got it. punt on error. */
> - svn_string_set(rb->namestr, name);
> + svn_stringbuf_set(rb->namestr, name);
>
> att = get_attr(atts, "copyfrom-path");
> if (att != NULL)
> {
> cpath = rb->cpathstr;
> - svn_string_set(cpath, att);
> + svn_stringbuf_set(cpath, att);
>
> att = get_attr(atts, "copyfrom-rev");
> /* ### verify we got it. punt on error. */
> @@ -924,7 +924,7 @@
> case ELEM_delete_entry:
> name = get_attr(atts, "name");
> /* ### verify we got it. punt on error. */
> - svn_string_set(rb->namestr, name);
> + svn_stringbuf_set(rb->namestr, name);
>
> CHKERR( (*rb->editor->delete_entry)(rb->namestr, TOP_DIR(rb).baton) );
> break;
> @@ -1078,7 +1078,7 @@
> rb->cpathstr = MAKE_BUFFER(rb->ras->pool);
> rb->href = MAKE_BUFFER(rb->ras->pool);
>
> - rb->vuh.name = svn_string_create(SVN_RA_DAV__LP_VSN_URL, rb->ras->pool);
> + rb->vuh.name = svn_stringbuf_create(SVN_RA_DAV__LP_VSN_URL, rb->ras->pool);
> rb->vuh.value = MAKE_BUFFER(rb->ras->pool);
>
> fp = fopen(rb->fname->data, "rb");
> @@ -1142,7 +1142,7 @@
> work.
> */
> /* ### fucking svn_stringbuf_t */
> - path = svn_string_create(".svn_update", ras->pool);
> + path = svn_stringbuf_create(".svn_update", ras->pool);
> SVN_ERR( svn_io_open_unique_file(&rb->tmpfile, &rb->fname, path,
> ".ra_dav", ras->pool) );
>
>
>
>
> 1.12 +3 -3 subversion/subversion/libsvn_ra_dav/merge.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_ra_dav/merge.c.diff?r1=1.11&r2=1.12
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: merge.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_ra_dav/merge.c,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -u -b -r1.11 -r1.12
> --- merge.c 2001/06/08 09:01:04 1.11
> +++ merge.c 2001/06/13 09:10:33 1.12
> @@ -479,7 +479,7 @@
> break;
>
> case ELEM_version_name:
> - svn_string_set(mc->vsn_name, cdata);
> + svn_stringbuf_set(mc->vsn_name, cdata);
> break;
>
> default:
> @@ -520,7 +520,7 @@
> mc.vsn_url = MAKE_BUFFER(pool);
>
> /* ### damn it */
> - mc.vsn_url_name = svn_string_create(SVN_RA_DAV__LP_VSN_URL, pool);
> + mc.vsn_url_name = svn_stringbuf_create(SVN_RA_DAV__LP_VSN_URL, pool);
>
> body = apr_psprintf(pool,
> "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
> @@ -545,7 +545,7 @@
> path_str = MAKE_BUFFER(pool);
> for (i = 0; i < deleted_entries->nelts; ++i)
> {
> - svn_string_set(path_str,
> + svn_stringbuf_set(path_str,
> APR_ARRAY_IDX(deleted_entries, i, const char *));
> SVN_ERR( (*close_commit)(close_baton, path_str, mc.rev) );
> }
>
>
>
> 1.8 +1 -1 subversion/subversion/libsvn_ra_dav/options.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_ra_dav/options.c.diff?r1=1.7&r2=1.8
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: options.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_ra_dav/options.c,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -b -r1.7 -r1.8
> --- options.c 2001/06/08 09:01:04 1.7
> +++ options.c 2001/06/13 09:10:33 1.8
> @@ -85,7 +85,7 @@
>
> if (elm->id == DAV_ELM_href)
> {
> - oc->activity_url = svn_string_create(cdata, oc->pool);
> + oc->activity_url = svn_stringbuf_create(cdata, oc->pool);
> }
>
> return 0;
>
>
>
> 1.27 +2 -2 subversion/subversion/libsvn_ra_dav/ra_dav.h
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_ra_dav/ra_dav.h.diff?r1=1.26&r2=1.27
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: ra_dav.h
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_ra_dav/ra_dav.h,v
> retrieving revision 1.26
> retrieving revision 1.27
> diff -u -b -r1.26 -r1.27
> --- ra_dav.h 2001/06/12 01:43:36 1.26
> +++ ra_dav.h 2001/06/13 09:10:33 1.27
> @@ -198,11 +198,11 @@
> apr_pool_t *pool);
>
>
> -/* Make a buffer for repeated use with svn_string_set().
> +/* Make a buffer for repeated use with svn_stringbuf_set().
> ### it would be nice to start this buffer with N bytes, but there isn't
> ### really a way to do that in the string interface (yet), short of
> ### initializing it with a fake string (and copying it) */
> -#define MAKE_BUFFER(p) svn_string_ncreate("", 0, (p))
> +#define MAKE_BUFFER(p) svn_stringbuf_ncreate("", 0, (p))
>
> void svn_ra_dav__copy_href(svn_stringbuf_t *dst, const char *src);
>
>
>
>
> 1.4 +1 -1 subversion/subversion/libsvn_ra_dav/util.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_ra_dav/util.c.diff?r1=1.3&r2=1.4
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: util.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_ra_dav/util.c,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -b -r1.3 -r1.4
> --- util.c 2001/06/08 09:01:04 1.3
> +++ util.c 2001/06/13 09:10:33 1.4
> @@ -32,7 +32,7 @@
> server-relative path (i.e. this uri_parse is effectively a no-op).
> */
> (void) uri_parse(src, &parsed_url, NULL);
> - svn_string_set(dst, parsed_url.path);
> + svn_stringbuf_set(dst, parsed_url.path);
> uri_free(&parsed_url);
> }
>
>
>
>
> 1.12 +4 -4 subversion/subversion/libsvn_ra_local/checkout.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_ra_local/checkout.c.diff?r1=1.11&r2=1.12
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: checkout.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_ra_local/checkout.c,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -u -b -r1.11 -r1.12
> --- checkout.c 2001/06/08 21:31:21 1.11
> +++ checkout.c 2001/06/13 09:10:34 1.12
> @@ -90,7 +90,7 @@
>
> apr_hash_this (hi, &key, &klen, &val);
> value = (svn_stringbuf_t *) val;
> - name = svn_string_ncreate (key, klen, pool);
> + name = svn_stringbuf_ncreate (key, klen, pool);
>
> if (is_dir)
> SVN_ERR (editor->change_dir_prop (object_baton, name, value));
> @@ -139,12 +139,12 @@
> apr_size_t klen;
> svn_fs_dirent_t *dirent;
> svn_stringbuf_t *dirent_name;
> - svn_stringbuf_t *URL_path = svn_string_dup (URL, subpool);
> - svn_stringbuf_t *dirent_path = svn_string_dup (dir_path, subpool);
> + svn_stringbuf_t *URL_path = svn_stringbuf_dup (URL, subpool);
> + svn_stringbuf_t *dirent_path = svn_stringbuf_dup (dir_path, subpool);
>
> apr_hash_this (hi, &key, &klen, &val);
> dirent = (svn_fs_dirent_t *) val;
> - dirent_name = svn_string_create (dirent->name, subpool);
> + dirent_name = svn_stringbuf_create (dirent->name, subpool);
> svn_path_add_component (dirent_path, dirent_name, svn_path_repos_style);
> svn_path_add_component (URL_path, dirent_name, svn_path_url_style);
>
>
>
>
> 1.12 +3 -3 subversion/subversion/libsvn_ra_local/split_url.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_ra_local/split_url.c.diff?r1=1.11&r2=1.12
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: split_url.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_ra_local/split_url.c,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -u -b -r1.11 -r1.12
> --- split_url.c 2001/06/08 21:31:21 1.11
> +++ split_url.c 2001/06/13 09:10:34 1.12
> @@ -57,7 +57,7 @@
> ("svn_ra_local__split_URL: URL contains unsupported hostname"));
>
> /* Duplicate the URL, starting at the top of the path */
> - url = svn_string_create ((const char *)path, subpool);
> + url = svn_stringbuf_create ((const char *)path, subpool);
>
> /* Loop, trying to open a FS at URL. If this fails, remove the last
> component from the URL, then try again. */
> @@ -96,8 +96,8 @@
> /* What remains of URL after being hacked at in the previous step is
> REPOS_PATH. FS_PATH is what we've hacked off in the process. We
> need to make sure these are allocated in the -original- pool. */
> - *repos_path = svn_string_dup (url, pool);
> - *fs_path = svn_string_create (path + url->len, pool);
> + *repos_path = svn_stringbuf_dup (url, pool);
> + *fs_path = svn_stringbuf_create (path + url->len, pool);
>
> /* Destroy our temporary memory pool. */
> svn_pool_destroy (subpool);
>
>
>
> 1.10 +7 -7 subversion/subversion/libsvn_repos/commit_editor.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_repos/commit_editor.c.diff?r1=1.9&r2=1.10
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: commit_editor.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_repos/commit_editor.c,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -b -r1.9 -r1.10
> --- commit_editor.c 2001/06/12 17:41:28 1.9
> +++ commit_editor.c 2001/06/13 09:10:34 1.10
> @@ -144,7 +144,7 @@
> dirb->base_rev = base_revision;
> dirb->parent = NULL;
> dirb->subpool = subpool;
> - dirb->path = svn_string_dup (eb->base_path, dirb->subpool);
> + dirb->path = svn_stringbuf_dup (eb->base_path, dirb->subpool);
> dirb->ref_count = 1;
>
> *root_baton = dirb;
> @@ -159,7 +159,7 @@
> {
> struct dir_baton *parent = parent_baton;
> struct edit_baton *eb = parent->edit_baton;
> - svn_stringbuf_t *path_to_kill = svn_string_dup (parent->path, parent->subpool);
> + svn_stringbuf_t *path_to_kill = svn_stringbuf_dup (parent->path, parent->subpool);
> svn_path_add_component (path_to_kill, name, svn_path_repos_style);
>
> /* This routine is a mindless wrapper. We call svn_fs_delete_tree
> @@ -202,7 +202,7 @@
> new_dirb->parent = pb;
> new_dirb->ref_count = 1;
> new_dirb->subpool = subpool;
> - new_dirb->path = svn_string_dup (pb->path, new_dirb->subpool);
> + new_dirb->path = svn_stringbuf_dup (pb->path, new_dirb->subpool);
> svn_path_add_component (new_dirb->path, name, svn_path_repos_style);
>
> /* Increment parent's refcount. */
> @@ -258,7 +258,7 @@
> new_dirb->parent = pb;
> new_dirb->subpool = subpool;
> new_dirb->ref_count = 1;
> - new_dirb->path = svn_string_dup (pb->path, new_dirb->subpool);
> + new_dirb->path = svn_stringbuf_dup (pb->path, new_dirb->subpool);
> svn_path_add_component (new_dirb->path, name, svn_path_repos_style);
>
> /* Increment parent's refcount. */
> @@ -358,7 +358,7 @@
> new_fb = apr_pcalloc (subpool, sizeof (*new_fb));
> new_fb->parent = pb;
> new_fb->subpool = subpool;
> - new_fb->path = svn_string_dup (pb->path, new_fb->subpool);
> + new_fb->path = svn_stringbuf_dup (pb->path, new_fb->subpool);
> svn_path_add_component (new_fb->path, name, svn_path_repos_style);
>
> /* Increment parent's refcount. */
> @@ -407,7 +407,7 @@
> new_fb = apr_pcalloc (subpool, sizeof (*new_fb));
> new_fb->parent = pb;
> new_fb->subpool = subpool;
> - new_fb->path = svn_string_dup (pb->path, new_fb->subpool);
> + new_fb->path = svn_stringbuf_dup (pb->path, new_fb->subpool);
> svn_path_add_component (new_fb->path, name, svn_path_repos_style);
>
> /* Increment parent's refcount. */
> @@ -570,7 +570,7 @@
> eb->log_msg.len = log_msg->len;
> eb->hook = hook;
> eb->hook_baton = hook_baton;
> - eb->base_path = svn_string_dup (base_path, subpool);
> + eb->base_path = svn_stringbuf_dup (base_path, subpool);
> eb->fs = fs;
> eb->txn = NULL;
>
>
>
>
> 1.50 +20 -20 subversion/subversion/libsvn_repos/delta.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_repos/delta.c.diff?r1=1.49&r2=1.50
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: delta.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_repos/delta.c,v
> retrieving revision 1.49
> retrieving revision 1.50
> diff -u -b -r1.49 -r1.50
> --- delta.c 2001/06/08 21:31:21 1.49
> +++ delta.c 2001/06/13 09:10:34 1.50
> @@ -229,7 +229,7 @@
> &root_baton));
>
> /* Construct the full path of the update item. */
> - full_path = svn_string_dup (parent_dir, pool);
> + full_path = svn_stringbuf_dup (parent_dir, pool);
> if (entry && entry->len > 0)
> svn_path_add_component (full_path, entry,
> svn_path_repos_style);
> @@ -411,7 +411,7 @@
> }
>
> /* Make a copy of our path that we can hack on. */
> - path_copy = svn_string_dup (path, pool);
> + path_copy = svn_stringbuf_dup (path, pool);
>
> /* If we haven't found a valid revision yet, and our copy of the
> path isn't empty, hack the last component off the path and see if
> @@ -504,7 +504,7 @@
>
> /* KEY is property name in target, VAL the value */
> apr_hash_this (hi, &key, &klen, &val);
> - t_name = svn_string_ncreate (key, klen, subpool);
> + t_name = svn_stringbuf_ncreate (key, klen, subpool);
> t_value = val;
>
> /* See if this property existed in the source. If so, and if
> @@ -513,7 +513,7 @@
> if (s_props
> && ((s_value = apr_hash_get (s_props, key, klen)) != 0))
> {
> - if (svn_string_compare (s_value, t_value))
> + if (svn_stringbuf_compare (s_value, t_value))
> SVN_ERR (change_fn (c, object, t_name, t_value, subpool));
>
> /* Remove the property from source list so we can track
> @@ -541,7 +541,7 @@
>
> /* KEY is property name in target, VAL the value */
> apr_hash_this (hi, &key, &klen, &val);
> - s_name = svn_string_ncreate (key, klen, subpool);
> + s_name = svn_stringbuf_ncreate (key, klen, subpool);
> s_value = val;
>
> SVN_ERR (change_fn (c, object, s_name, s_value, subpool));
> @@ -674,7 +674,7 @@
> abort();
>
> /* Get the target's full path */
> - target_full_path = svn_string_dup (target_parent, pool);
> + target_full_path = svn_stringbuf_dup (target_parent, pool);
> svn_path_add_component
> (target_full_path, target_entry, svn_path_repos_style);
>
> @@ -685,7 +685,7 @@
> if (source_parent && source_entry)
> {
> /* Get the source's full path */
> - source_full_path = svn_string_dup (source_parent, pool);
> + source_full_path = svn_stringbuf_dup (source_parent, pool);
> svn_path_add_component
> (source_full_path, source_entry, svn_path_repos_style);
>
> @@ -752,7 +752,7 @@
> abort();
>
> /* Get the target's full path */
> - target_full_path = svn_string_dup (target_parent, pool);
> + target_full_path = svn_stringbuf_dup (target_parent, pool);
> svn_path_add_component
> (target_full_path, target_entry, svn_path_repos_style);
>
> @@ -761,7 +761,7 @@
> target_full_path->data, pool));
>
> /* Get the source's full path */
> - source_full_path = svn_string_dup (source_parent, pool);
> + source_full_path = svn_stringbuf_dup (source_parent, pool);
> svn_path_add_component
> (source_full_path, source_entry, svn_path_repos_style);
>
> @@ -830,7 +830,7 @@
> subpool = svn_pool_create (pool);
>
> /* If there's no source to search, return a failed ancestor hunt. */
> - source_full_path = svn_string_create ("", subpool);
> + source_full_path = svn_stringbuf_create ("", subpool);
> if (! source_parent)
> {
> *s_entry = 0;
> @@ -846,8 +846,8 @@
> SVN_ERR (svn_fs_dir_entries (&s_entries, c->source_root,
> source_parent->data, pool));
>
> - target_full_path = svn_string_dup (target_parent, subpool);
> - target_entry = svn_string_create (t_entry->name, subpool);
> + target_full_path = svn_stringbuf_dup (target_parent, subpool);
> + target_entry = svn_stringbuf_create (t_entry->name, subpool);
> svn_path_add_component (target_full_path, target_entry,
> svn_path_repos_style);
>
> @@ -875,9 +875,9 @@
> apr_hash_this (hi, &key, &klen, &val);
> this_entry = val;
>
> - svn_string_set (source_full_path, source_parent->data);
> + svn_stringbuf_set (source_full_path, source_parent->data);
> svn_path_add_component (source_full_path,
> - svn_string_create (this_entry->name, subpool),
> + svn_stringbuf_create (this_entry->name, subpool),
> svn_path_repos_style);
>
> /* Is this entry a file or a directory? */
> @@ -933,7 +933,7 @@
> {
> apr_hash_t *s_entries = 0, *t_entries = 0;
> apr_hash_index_t *hi;
> - svn_stringbuf_t *target_name = svn_string_create ("", pool);
> + svn_stringbuf_t *target_name = svn_stringbuf_create ("", pool);
> apr_pool_t *subpool;
>
> /* Compare the property lists. */
> @@ -982,7 +982,7 @@
> apr_hash_this (hi, &key, &klen, &val);
> t_entry = val;
>
> - svn_string_set (target_name, t_entry->name);
> + svn_stringbuf_set (target_name, t_entry->name);
>
> /* Can we find something with the same name in the source
> entries hash? */
> @@ -1039,7 +1039,7 @@
> target_path,
> target_name,
> source_path,
> - svn_string_create (best_entry->name, subpool),
> + svn_stringbuf_create (best_entry->name, subpool),
> subpool));
> }
> #endif
> @@ -1051,7 +1051,7 @@
> target_path,
> target_name,
> source_path,
> - svn_string_create (s_entry->name, subpool),
> + svn_stringbuf_create (s_entry->name, subpool),
> subpool));
> }
>
> @@ -1085,7 +1085,7 @@
> target_path,
> target_name,
> source_path,
> - svn_string_create (best_entry->name, subpool),
> + svn_stringbuf_create (best_entry->name, subpool),
> subpool));
> #endif
> }
> @@ -1109,7 +1109,7 @@
> s_entry = val;
>
> SVN_ERR (delete (c, dir_baton,
> - svn_string_create (s_entry->name, subpool),
> + svn_stringbuf_create (s_entry->name, subpool),
> subpool));
> }
> }
>
>
>
> 1.12 +3 -3 subversion/subversion/libsvn_repos/reporter.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_repos/reporter.c.diff?r1=1.11&r2=1.12
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: reporter.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_repos/reporter.c,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -u -b -r1.11 -r1.12
> --- reporter.c 2001/06/09 12:36:08 1.11
> +++ reporter.c 2001/06/13 09:10:34 1.12
> @@ -95,7 +95,7 @@
> reported) + path (stuff relative to the target...this is the
> empty string in the file case since the target is the file
> itself, not a directory containing the file). */
> - from_path = svn_string_dup (rbaton->base_path, rbaton->pool);
> + from_path = svn_stringbuf_dup (rbaton->base_path, rbaton->pool);
> svn_path_add_component (from_path, rbaton->target,
> svn_path_repos_style);
> svn_path_add_component (from_path, path, svn_path_repos_style);
> @@ -128,7 +128,7 @@
> reported) + path (stuff relative to the target...this is the
> empty string in the file case since the target is the file
> itself, not a directory containing the file). */
> - delete_path = svn_string_dup (rbaton->base_path, rbaton->pool);
> + delete_path = svn_stringbuf_dup (rbaton->base_path, rbaton->pool);
> svn_path_add_component (delete_path, rbaton->target,
> svn_path_repos_style);
> svn_path_add_component (delete_path, path, svn_path_repos_style);
> @@ -211,7 +211,7 @@
>
> /* If the target is "this dir", clear it out. */
> if (svn_path_is_thisdir (rbaton->target, svn_path_repos_style))
> - svn_string_setempty (rbaton->target);
> + svn_stringbuf_setempty (rbaton->target);
>
> rbaton->pool = pool;
>
>
>
>
> 1.20 +11 -11 subversion/subversion/libsvn_subr/base64.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_subr/base64.c.diff?r1=1.19&r2=1.20
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: base64.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_subr/base64.c,v
> retrieving revision 1.19
> retrieving revision 1.20
> diff -u -b -r1.19 -r1.20
> --- base64.c 2001/06/08 21:31:22 1.19
> +++ base64.c 2001/06/13 09:10:34 1.20
> @@ -76,12 +76,12 @@
> memcpy (inbuf + *inbuflen, p, 3 - *inbuflen);
> p += (3 - *inbuflen);
> encode_group (inbuf, group);
> - svn_string_appendbytes (str, group, 4);
> + svn_stringbuf_appendbytes (str, group, 4);
> *inbuflen = 0;
> *linelen += 4;
> if (*linelen == BASE64_LINELEN)
> {
> - svn_string_appendcstr (str, "\n");
> + svn_stringbuf_appendcstr (str, "\n");
> *linelen = 0;
> }
> }
> @@ -107,11 +107,11 @@
> memset (ingroup + len, 0, 3 - len);
> encode_group (ingroup, outgroup);
> memset (outgroup + (len + 1), '=', 4 - (len + 1));
> - svn_string_appendbytes (str, outgroup, 4);
> + svn_stringbuf_appendbytes (str, outgroup, 4);
> linelen += 4;
> }
> if (linelen > 0)
> - svn_string_appendcstr (str, "\n");
> + svn_stringbuf_appendcstr (str, "\n");
> }
>
>
> @@ -121,7 +121,7 @@
> {
> struct encode_baton *eb = baton;
> apr_pool_t *subpool = svn_pool_create (eb->pool);
> - svn_stringbuf_t *encoded = svn_string_create ("", subpool);
> + svn_stringbuf_t *encoded = svn_stringbuf_create ("", subpool);
> apr_size_t enclen;
> svn_error_t *err = SVN_NO_ERROR;
>
> @@ -140,7 +140,7 @@
> finish_encoding_data (void *baton)
> {
> struct encode_baton *eb = baton;
> - svn_stringbuf_t *encoded = svn_string_create ("", eb->pool);
> + svn_stringbuf_t *encoded = svn_stringbuf_create ("", eb->pool);
> apr_size_t enclen;
> svn_error_t *err = SVN_NO_ERROR;
>
> @@ -179,7 +179,7 @@
> svn_stringbuf_t *
> svn_base64_encode_string (svn_stringbuf_t *str, apr_pool_t *pool)
> {
> - svn_stringbuf_t *encoded = svn_string_create ("", pool);
> + svn_stringbuf_t *encoded = svn_stringbuf_create ("", pool);
> char ingroup[3];
> int ingrouplen = 0, linelen = 0;
>
> @@ -236,7 +236,7 @@
> {
> memset (inbuf + *inbuflen, 0, 4 - *inbuflen);
> decode_group (inbuf, group);
> - svn_string_appendbytes (str, group, *inbuflen - 1);
> + svn_stringbuf_appendbytes (str, group, *inbuflen - 1);
> }
> *done = TRUE;
> }
> @@ -248,7 +248,7 @@
> if (*inbuflen == 4)
> {
> decode_group (inbuf, group);
> - svn_string_appendbytes (str, group, 3);
> + svn_stringbuf_appendbytes (str, group, 3);
> *inbuflen = 0;
> }
> }
> @@ -268,7 +268,7 @@
>
> /* Decode this block of data. */
> subpool = svn_pool_create (db->pool);
> - decoded = svn_string_create ("", subpool);
> + decoded = svn_stringbuf_create ("", subpool);
> decode_bytes (decoded, data, *len, db->buf, &db->buflen, &db->done);
>
> /* Write the output, clean up, go home. */
> @@ -315,7 +315,7 @@
> svn_stringbuf_t *
> svn_base64_decode_string (svn_stringbuf_t *str, apr_pool_t *pool)
> {
> - svn_stringbuf_t *decoded = svn_string_create ("", pool);
> + svn_stringbuf_t *decoded = svn_stringbuf_create ("", pool);
> unsigned char ingroup[4];
> int ingrouplen = 0;
> svn_boolean_t done = FALSE;
>
>
>
> 1.40 +5 -5 subversion/subversion/libsvn_subr/io.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_subr/io.c.diff?r1=1.39&r2=1.40
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: io.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_subr/io.c,v
> retrieving revision 1.39
> retrieving revision 1.40
> diff -u -b -r1.39 -r1.40
> --- io.c 2001/06/09 03:04:35 1.39
> +++ io.c 2001/06/13 09:10:34 1.40
> @@ -97,7 +97,7 @@
> (unsigned int)unique_name,
> &random_portion_width);
>
> - *unique_name = svn_string_dup (path, pool);
> + *unique_name = svn_stringbuf_dup (path, pool);
>
> /* Not sure of a portable PATH_MAX constant to use here, so just
> guessing at 255. */
> @@ -108,11 +108,11 @@
> + 3 /* 2 dots */
> + 5 /* 5 digits of iteration portion */
> + strlen (suffix);
> - svn_string_chop (*unique_name, chop_amt);
> + svn_stringbuf_chop (*unique_name, chop_amt);
> }
>
> iterating_portion_idx = (*unique_name)->len + random_portion_width + 2;
> - svn_string_appendcstr (*unique_name,
> + svn_stringbuf_appendcstr (*unique_name,
> apr_psprintf (pool, ".%s.00000%s",
> random_portion, suffix));
>
> @@ -603,7 +603,7 @@
> apr_size_t len;
> apr_file_t *f = NULL;
>
> - res = svn_string_create ("", pool);
> + res = svn_stringbuf_create ("", pool);
>
> apr_err = apr_file_open (&f, filename, APR_READ, APR_OS_DEFAULT, pool);
> if (apr_err)
> @@ -618,7 +618,7 @@
> "read_from_file: failed to read '%s'",
> filename);
>
> - svn_string_appendbytes (res, buf, len);
> + svn_stringbuf_appendbytes (res, buf, len);
> } while (len != 0);
>
> apr_err = apr_file_close (f);
>
>
>
> 1.39 +17 -17 subversion/subversion/libsvn_subr/path.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_subr/path.c.diff?r1=1.38&r2=1.39
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: path.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_subr/path.c,v
> retrieving revision 1.38
> retrieving revision 1.39
> diff -u -b -r1.38 -r1.39
> --- path.c 2001/06/08 09:01:05 1.38
> +++ path.c 2001/06/13 09:10:34 1.39
> @@ -93,10 +93,10 @@
> {
> char dirsep = get_separator_from_style (style);
>
> - if (! svn_string_isempty (path))
> - svn_string_appendbytes (path, &dirsep, sizeof (dirsep));
> + if (! svn_stringbuf_isempty (path))
> + svn_stringbuf_appendbytes (path, &dirsep, sizeof (dirsep));
>
> - svn_string_appendbytes (path, component, len);
> + svn_stringbuf_appendbytes (path, component, len);
> svn_path_canonicalize (path, style);
> }
>
> @@ -126,8 +126,8 @@
>
> svn_path_canonicalize (path, style);
>
> - if (! svn_string_chop_back_to_char (path, dirsep))
> - svn_string_setempty (path);
> + if (! svn_stringbuf_chop_back_to_char (path, dirsep))
> + svn_stringbuf_setempty (path);
> }
>
>
> @@ -139,15 +139,15 @@
> char dirsep = get_separator_from_style (style);
>
> apr_size_t i
> - = svn_string_find_char_backward (path, dirsep);
> + = svn_stringbuf_find_char_backward (path, dirsep);
>
> if (i < path->len)
> {
> i += 1; /* Get past the separator char. */
> - return svn_string_ncreate (path->data + i, (path->len - i), pool);
> + return svn_stringbuf_ncreate (path->data + i, (path->len - i), pool);
> }
> else
> - return svn_string_dup (path, pool);
> + return svn_stringbuf_dup (path, pool);
> }
>
>
> @@ -165,7 +165,7 @@
>
> if (dirpath)
> {
> - n_dirpath = svn_string_dup (path, pool);
> + n_dirpath = svn_stringbuf_dup (path, pool);
> svn_path_remove_component (n_dirpath, style);
> }
>
> @@ -199,7 +199,7 @@
> svn_path_is_empty (const svn_stringbuf_t *path, enum svn_path_style style)
> {
> return ((path == NULL)
> - || (svn_string_isempty (path))
> + || (svn_stringbuf_isempty (path))
> || (svn_path_is_thisdir (path, style)));
> }
>
> @@ -243,7 +243,7 @@
> /* If either string is NULL or empty, we must go no further. */
>
> if ((! path1) || (! path2)
> - || (svn_string_isempty (path1)) || (svn_string_isempty (path2)))
> + || (svn_stringbuf_isempty (path1)) || (svn_stringbuf_isempty (path2)))
> return NULL;
>
> while (path1->data[i] == path2->data[i])
> @@ -265,9 +265,9 @@
> if (((i == path1->len) && (path2->data[i] == dirsep))
> || ((i == path2->len) && (path1->data[i] == dirsep))
> || ((i == path1->len) && (i == path2->len)))
> - common_path = svn_string_ncreate (path1->data, i, pool);
> + common_path = svn_stringbuf_ncreate (path1->data, i, pool);
> else
> - common_path = svn_string_ncreate (path1->data, last_dirsep, pool);
> + common_path = svn_stringbuf_ncreate (path1->data, last_dirsep, pool);
>
> svn_path_canonicalize (common_path, svn_path_local_style);
>
> @@ -291,7 +291,7 @@
>
> /* If either path is empty, return NULL. */
> if ((! path1) || (! path2)
> - || (svn_string_isempty (path1)) || (svn_string_isempty (path2)))
> + || (svn_stringbuf_isempty (path1)) || (svn_stringbuf_isempty (path2)))
> return NULL;
>
> /* If path2 isn't longer than path1, return NULL. */
> @@ -315,11 +315,11 @@
> if (i == path1->len)
> {
> if (path1->data[i - 1] == dirsep)
> - return svn_string_ncreate (path2->data + i,
> + return svn_stringbuf_ncreate (path2->data + i,
> path2->len - i,
> pool);
> else if (path2->data[i] == dirsep)
> - return svn_string_ncreate (path2->data + i + 1,
> + return svn_stringbuf_ncreate (path2->data + i + 1,
> path2->len - i - 1,
> pool);
> }
> @@ -337,7 +337,7 @@
> {
> svn_stringbuf_t **receiver;
>
> - svn_stringbuf_t *component = svn_string_ncreate (bytes, len, pool);
> + svn_stringbuf_t *component = svn_stringbuf_ncreate (bytes, len, pool);
>
> receiver = (svn_stringbuf_t **) apr_array_push (array);
> *receiver = component;
>
>
>
> 1.7 +10 -10 subversion/subversion/libsvn_subr/quoprint.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_subr/quoprint.c.diff?r1=1.6&r2=1.7
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: quoprint.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_subr/quoprint.c,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -b -r1.6 -r1.7
> --- quoprint.c 2001/06/08 21:31:22 1.6
> +++ quoprint.c 2001/06/13 09:10:34 1.7
> @@ -83,7 +83,7 @@
> /* Encode this character. */
> if (ENCODE_AS_LITERAL(*p))
> {
> - svn_string_appendbytes (str, p, 1);
> + svn_stringbuf_appendbytes (str, p, 1);
> (*linelen)++;
> }
> else
> @@ -91,14 +91,14 @@
> buf[0] = '=';
> buf[1] = hextab[(*p >> 4) & 0xf];
> buf[2] = hextab[*p & 0xf];
> - svn_string_appendbytes (str, buf, 3);
> + svn_stringbuf_appendbytes (str, buf, 3);
> *linelen += 3;
> }
>
> /* Make sure our output lines don't exceed QUOPRINT_LINELEN. */
> if (*linelen + 3 > QUOPRINT_LINELEN)
> {
> - svn_string_appendcstr (str, "=\n");
> + svn_stringbuf_appendcstr (str, "=\n");
> *linelen = 0;
> }
> }
> @@ -111,7 +111,7 @@
> {
> struct encode_baton *eb = baton;
> apr_pool_t *subpool = svn_pool_create (eb->pool);
> - svn_stringbuf_t *encoded = svn_string_create ("", subpool);
> + svn_stringbuf_t *encoded = svn_stringbuf_create ("", subpool);
> apr_size_t enclen;
> svn_error_t *err = SVN_NO_ERROR;
>
> @@ -168,12 +168,12 @@
> svn_stringbuf_t *
> svn_quoprint_encode_string (svn_stringbuf_t *str, apr_pool_t *pool)
> {
> - svn_stringbuf_t *encoded = svn_string_create ("", pool);
> + svn_stringbuf_t *encoded = svn_stringbuf_create ("", pool);
> int linelen = 0;
>
> encode_bytes (encoded, str->data, str->len, &linelen);
> if (linelen > 0)
> - svn_string_appendcstr (encoded, "=\n");
> + svn_stringbuf_appendcstr (encoded, "=\n");
> return encoded;
> }
>
> @@ -209,7 +209,7 @@
> {
> /* Literal character; append it if it's valid as such. */
> if (VALID_LITERAL(*inbuf))
> - svn_string_appendbytes (str, inbuf, 1);
> + svn_stringbuf_appendbytes (str, inbuf, 1);
> *inbuflen = 0;
> }
> else if (*inbuf == '=' && *inbuflen == 2 && inbuf[1] == '\n')
> @@ -225,7 +225,7 @@
> if (find1 != NULL && find2 != NULL)
> {
> c = ((find1 - hextab) << 4) | (find2 - hextab);
> - svn_string_appendbytes (str, &c, 1);
> + svn_stringbuf_appendbytes (str, &c, 1);
> }
> *inbuflen = 0;
> }
> @@ -245,7 +245,7 @@
>
> /* Decode this block of data. */
> subpool = svn_pool_create (db->pool);
> - decoded = svn_string_create ("", subpool);
> + decoded = svn_stringbuf_create ("", subpool);
> decode_bytes (decoded, data, *len, db->buf, &db->buflen);
>
> /* Write the output, clean up, go home. */
> @@ -291,7 +291,7 @@
> svn_stringbuf_t *
> svn_quoprint_decode_string (svn_stringbuf_t *str, apr_pool_t *pool)
> {
> - svn_stringbuf_t *decoded = svn_string_create ("", pool);
> + svn_stringbuf_t *decoded = svn_stringbuf_create ("", pool);
> unsigned char ingroup[4];
> int ingrouplen = 0;
>
>
>
>
> 1.15 +29 -29 subversion/subversion/libsvn_subr/svn_string.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_subr/svn_string.c.diff?r1=1.14&r2=1.15
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: svn_string.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_subr/svn_string.c,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -b -r1.14 -r1.15
> --- svn_string.c 2001/06/08 09:01:05 1.14
> +++ svn_string.c 2001/06/13 09:10:34 1.15
> @@ -62,7 +62,7 @@
> }
>
> svn_stringbuf_t *
> -svn_string_ncreate (const char *bytes, const apr_size_t size,
> +svn_stringbuf_ncreate (const char *bytes, const apr_size_t size,
> apr_pool_t *pool)
> {
> char *data;
> @@ -81,14 +81,14 @@
>
>
> svn_stringbuf_t *
> -svn_string_create (const char *cstring, apr_pool_t *pool)
> +svn_stringbuf_create (const char *cstring, apr_pool_t *pool)
> {
> - return svn_string_ncreate (cstring, strlen (cstring), pool);
> + return svn_stringbuf_ncreate (cstring, strlen (cstring), pool);
> }
>
>
> svn_stringbuf_t *
> -svn_string_createv (apr_pool_t *pool, const char *fmt, va_list ap)
> +svn_stringbuf_createv (apr_pool_t *pool, const char *fmt, va_list ap)
> {
> char *data = apr_pvsprintf (pool, fmt, ap);
>
> @@ -98,13 +98,13 @@
>
>
> svn_stringbuf_t *
> -svn_string_createf (apr_pool_t *pool, const char *fmt, ...)
> +svn_stringbuf_createf (apr_pool_t *pool, const char *fmt, ...)
> {
> svn_stringbuf_t *str;
>
> va_list ap;
> va_start (ap, fmt);
> - str = svn_string_createv (pool, fmt, ap);
> + str = svn_stringbuf_createv (pool, fmt, ap);
> va_end (ap);
>
> return str;
> @@ -112,24 +112,24 @@
>
>
> void
> -svn_string_fillchar (svn_stringbuf_t *str, const unsigned char c)
> +svn_stringbuf_fillchar (svn_stringbuf_t *str, const unsigned char c)
> {
> memset (str->data, c, str->len);
> }
>
>
> void
> -svn_string_set (svn_stringbuf_t *str, const char *value)
> +svn_stringbuf_set (svn_stringbuf_t *str, const char *value)
> {
> apr_size_t amt = strlen (value);
>
> - svn_string_ensure (str, amt + 1);
> + svn_stringbuf_ensure (str, amt + 1);
> memcpy (str->data, value, amt + 1);
> str->len = amt;
> }
>
> void
> -svn_string_setempty (svn_stringbuf_t *str)
> +svn_stringbuf_setempty (svn_stringbuf_t *str)
> {
> if (str->len > 0)
> str->data[0] = '\0';
> @@ -139,7 +139,7 @@
>
>
> void
> -svn_string_chop (svn_stringbuf_t *str, apr_size_t nbytes)
> +svn_stringbuf_chop (svn_stringbuf_t *str, apr_size_t nbytes)
> {
> if (nbytes > str->len)
> str->len = 0;
> @@ -151,14 +151,14 @@
>
>
> svn_boolean_t
> -svn_string_isempty (const svn_stringbuf_t *str)
> +svn_stringbuf_isempty (const svn_stringbuf_t *str)
> {
> return (str->len == 0);
> }
>
>
> void
> -svn_string_ensure (svn_stringbuf_t *str,
> +svn_stringbuf_ensure (svn_stringbuf_t *str,
> apr_size_t minimum_size)
> {
> /* Keep doubling capacity until have enough. */
> @@ -179,7 +179,7 @@
>
>
> void
> -svn_string_appendbytes (svn_stringbuf_t *str, const char *bytes,
> +svn_stringbuf_appendbytes (svn_stringbuf_t *str, const char *bytes,
> const apr_size_t count)
> {
> apr_size_t total_len;
> @@ -188,7 +188,7 @@
> total_len = str->len + count; /* total size needed */
>
> /* +1 for null terminator. */
> - svn_string_ensure (str, (total_len + 1));
> + svn_stringbuf_ensure (str, (total_len + 1));
>
> /* get address 1 byte beyond end of original bytestring */
> start_address = (str->data + str->len);
> @@ -203,32 +203,32 @@
>
>
> void
> -svn_string_appendstr (svn_stringbuf_t *targetstr, const svn_stringbuf_t *appendstr)
> +svn_stringbuf_appendstr (svn_stringbuf_t *targetstr, const svn_stringbuf_t *appendstr)
> {
> - svn_string_appendbytes (targetstr, appendstr->data, appendstr->len);
> + svn_stringbuf_appendbytes (targetstr, appendstr->data, appendstr->len);
> }
>
>
> void
> -svn_string_appendcstr (svn_stringbuf_t *targetstr, const char *cstr)
> +svn_stringbuf_appendcstr (svn_stringbuf_t *targetstr, const char *cstr)
> {
> - svn_string_appendbytes (targetstr, cstr, strlen(cstr));
> + svn_stringbuf_appendbytes (targetstr, cstr, strlen(cstr));
> }
>
>
>
>
> svn_stringbuf_t *
> -svn_string_dup (const svn_stringbuf_t *original_string, apr_pool_t *pool)
> +svn_stringbuf_dup (const svn_stringbuf_t *original_string, apr_pool_t *pool)
> {
> - return (svn_string_ncreate (original_string->data,
> + return (svn_stringbuf_ncreate (original_string->data,
> original_string->len, pool));
> }
>
>
>
> svn_boolean_t
> -svn_string_compare (const svn_stringbuf_t *str1, const svn_stringbuf_t *str2)
> +svn_stringbuf_compare (const svn_stringbuf_t *str1, const svn_stringbuf_t *str2)
> {
> /* easy way out :) */
> if (str1->len != str2->len)
> @@ -245,7 +245,7 @@
>
>
> apr_size_t
> -svn_string_first_non_whitespace (const svn_stringbuf_t *str)
> +svn_stringbuf_first_non_whitespace (const svn_stringbuf_t *str)
> {
> apr_size_t i;
>
> @@ -263,12 +263,12 @@
>
>
> void
> -svn_string_strip_whitespace (svn_stringbuf_t *str)
> +svn_stringbuf_strip_whitespace (svn_stringbuf_t *str)
> {
> apr_size_t i;
>
> /* Find first non-whitespace character */
> - apr_size_t offset = svn_string_first_non_whitespace (str);
> + apr_size_t offset = svn_stringbuf_first_non_whitespace (str);
>
> /* Go ahead! Waste some RAM, we've got pools! :) */
> str->data += offset;
> @@ -291,7 +291,7 @@
>
>
> apr_size_t
> -svn_string_find_char_backward (const svn_stringbuf_t *str, char ch)
> +svn_stringbuf_find_char_backward (const svn_stringbuf_t *str, char ch)
> {
> int i; /* signed! */
>
> @@ -306,14 +306,14 @@
>
>
> apr_size_t
> -svn_string_chop_back_to_char (svn_stringbuf_t *str, char ch)
> +svn_stringbuf_chop_back_to_char (svn_stringbuf_t *str, char ch)
> {
> - apr_size_t i = svn_string_find_char_backward (str, ch);
> + apr_size_t i = svn_stringbuf_find_char_backward (str, ch);
>
> if (i < str->len)
> {
> apr_size_t nbytes = (str->len - i);
> - svn_string_chop (str, nbytes);
> + svn_stringbuf_chop (str, nbytes);
> return nbytes;
> }
>
>
>
>
> 1.11 +8 -8 subversion/subversion/libsvn_subr/target.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_subr/target.c.diff?r1=1.10&r2=1.11
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: target.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_subr/target.c,v
> retrieving revision 1.10
> retrieving revision 1.11
> diff -u -b -r1.10 -r1.11
> --- target.c 2001/06/08 21:31:22 1.10
> +++ target.c 2001/06/13 09:10:34 1.11
> @@ -37,7 +37,7 @@
> #ifdef WIN32
> if (_fullpath(buffer, relative->data, APR_PATH_MAX) != NULL)
> {
> - *pabsolute = svn_string_create(buffer, pool);
> + *pabsolute = svn_stringbuf_create(buffer, pool);
> }
> else
> {
> @@ -50,7 +50,7 @@
> #else
> if (realpath(relative->data, buffer) != NULL)
> {
> - *pabsolute = svn_string_create(buffer, pool);
> + *pabsolute = svn_stringbuf_create(buffer, pool);
> }
> else
> {
> @@ -102,7 +102,7 @@
> if (finfo.filetype == APR_DIR)
> {
> *pdirectory = path;
> - *pfile = svn_string_create("", pool);
> + *pfile = svn_stringbuf_create("", pool);
> }
> else if (finfo.filetype == APR_REG)
> {
> @@ -202,12 +202,12 @@
> if (! ancestor)
> continue;
>
> - if (svn_string_compare (ancestor, abs_targets_i))
> + if (svn_stringbuf_compare (ancestor, abs_targets_i))
> {
> removed[j] = TRUE;
> num_condensed--;
> }
> - else if (svn_string_compare (ancestor, abs_targets_j))
> + else if (svn_stringbuf_compare (ancestor, abs_targets_j))
> {
> removed[i] = TRUE;
> num_condensed--;
> @@ -221,7 +221,7 @@
> {
> svn_stringbuf_t *abs_targets_i = ((svn_stringbuf_t **)
> abs_targets->elts)[i];
> - if ((svn_string_compare (abs_targets_i, *pbasedir))
> + if ((svn_stringbuf_compare (abs_targets_i, *pbasedir))
> && !removed[i])
> {
> removed[i] = TRUE;
> @@ -245,7 +245,7 @@
> rel_item += (*pbasedir)->len + 1;
>
> (*((svn_stringbuf_t**)apr_array_push (*pcondensed_targets)))
> - = svn_string_create (rel_item, pool);
> + = svn_stringbuf_create (rel_item, pool);
> }
> }
>
> @@ -321,7 +321,7 @@
> svn_stringbuf_t *keeper = ((svn_stringbuf_t **)abs_targets->elts)[j];
>
> /* Quit here if we find this path already in the keepers. */
> - if (svn_string_compare (keeper, abs_path))
> + if (svn_stringbuf_compare (keeper, abs_path))
> {
> keep_me = FALSE;
> break;
>
>
>
> 1.40 +24 -24 subversion/subversion/libsvn_subr/xml.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_subr/xml.c.diff?r1=1.39&r2=1.40
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: xml.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_subr/xml.c,v
> retrieving revision 1.39
> retrieving revision 1.40
> diff -u -b -r1.39 -r1.40
> --- xml.c 2001/06/08 21:31:22 1.39
> +++ xml.c 2001/06/13 09:10:34 1.40
> @@ -33,7 +33,7 @@
> const char *p = start, *q;
>
> if (*outstr == NULL)
> - *outstr = svn_string_create ("", pool);
> + *outstr = svn_stringbuf_create ("", pool);
>
> while (1)
> {
> @@ -45,7 +45,7 @@
> while (q < end && *q != '&' && *q != '<' && *q != '>'
> && *q != '"' && *q != '\'')
> q++;
> - svn_string_appendbytes (*outstr, p, q - p);
> + svn_stringbuf_appendbytes (*outstr, p, q - p);
>
> /* We may already be a winner. */
> if (q == end)
> @@ -53,15 +53,15 @@
>
> /* Append the entity reference for the character. */
> if (*q == '&')
> - svn_string_appendcstr (*outstr, "&");
> + svn_stringbuf_appendcstr (*outstr, "&");
> else if (*q == '<')
> - svn_string_appendcstr (*outstr, "<");
> + svn_stringbuf_appendcstr (*outstr, "<");
> else if (*q == '>')
> - svn_string_appendcstr (*outstr, ">");
> + svn_stringbuf_appendcstr (*outstr, ">");
> else if (*q == '"')
> - svn_string_appendcstr (*outstr, """);
> + svn_stringbuf_appendcstr (*outstr, """);
> else if (*q == '\'')
> - svn_string_appendcstr (*outstr, "'");
> + svn_stringbuf_appendcstr (*outstr, "'");
>
> p = q + 1;
> }
> @@ -196,8 +196,8 @@
> svn_xml_make_header (svn_stringbuf_t **str, apr_pool_t *pool)
> {
> if (*str == NULL)
> - *str = svn_string_create ("", pool);
> - svn_string_appendcstr (*str, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
> + *str = svn_stringbuf_create ("", pool);
> + svn_stringbuf_appendcstr (*str, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
> }
>
>
> @@ -230,7 +230,7 @@
> continue;
> else
> apr_hash_set (ht, apr_pstrndup(pool, key, keylen), keylen,
> - val ? svn_string_create (val, pool) : NULL);
> + val ? svn_stringbuf_create (val, pool) : NULL);
> }
> }
>
> @@ -292,10 +292,10 @@
> apr_hash_index_t *hi;
>
> if (*str == NULL)
> - *str = svn_string_create ("", pool);
> + *str = svn_stringbuf_create ("", pool);
>
> - svn_string_appendcstr (*str, "<");
> - svn_string_appendcstr (*str, tagname);
> + svn_stringbuf_appendcstr (*str, "<");
> + svn_stringbuf_appendcstr (*str, tagname);
>
> for (hi = apr_hash_first (attributes); hi; hi = apr_hash_next (hi))
> {
> @@ -306,18 +306,18 @@
> apr_hash_this (hi, &key, &keylen, &val);
> assert (val != NULL);
>
> - svn_string_appendcstr (*str, "\n ");
> - svn_string_appendcstr (*str, (char *) key);
> - svn_string_appendcstr (*str, "=\"");
> + svn_stringbuf_appendcstr (*str, "\n ");
> + svn_stringbuf_appendcstr (*str, (char *) key);
> + svn_stringbuf_appendcstr (*str, "=\"");
> svn_xml_escape_string (str, (svn_stringbuf_t *) val, pool);
> - svn_string_appendcstr (*str, "\"");
> + svn_stringbuf_appendcstr (*str, "\"");
> }
>
> if (style == svn_xml_self_closing)
> - svn_string_appendcstr (*str, "/");
> - svn_string_appendcstr (*str, ">");
> + svn_stringbuf_appendcstr (*str, "/");
> + svn_stringbuf_appendcstr (*str, ">");
> if (style != svn_xml_protect_pcdata)
> - svn_string_appendcstr (*str, "\n");
> + svn_stringbuf_appendcstr (*str, "\n");
> }
>
>
> @@ -357,11 +357,11 @@
> const char *tagname)
> {
> if (*str == NULL)
> - *str = svn_string_create ("", pool);
> + *str = svn_stringbuf_create ("", pool);
>
> - svn_string_appendcstr (*str, "</");
> - svn_string_appendcstr (*str, tagname);
> - svn_string_appendcstr (*str, ">\n");
> + svn_stringbuf_appendcstr (*str, "</");
> + svn_stringbuf_appendcstr (*str, tagname);
> + svn_stringbuf_appendcstr (*str, ">\n");
> }
>
>
>
>
>
> 1.116 +24 -24 subversion/subversion/libsvn_wc/adm_crawler.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_wc/adm_crawler.c.diff?r1=1.115&r2=1.116
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: adm_crawler.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_wc/adm_crawler.c,v
> retrieving revision 1.115
> retrieving revision 1.116
> diff -u -b -r1.115 -r1.116
> --- adm_crawler.c 2001/06/11 17:35:04 1.115
> +++ adm_crawler.c 2001/06/13 09:10:34 1.116
> @@ -82,7 +82,7 @@
> struct stack_object *new_top = apr_pcalloc (pool, sizeof (*new_top));
>
> /* Store path and baton in a new stack object */
> - new_top->path = svn_string_dup (path, pool);
> + new_top->path = svn_stringbuf_dup (path, pool);
> new_top->baton = baton;
> new_top->this_dir = entry;
> new_top->next = NULL;
> @@ -135,7 +135,7 @@
> svn_stringbuf_t *unlock_path;
>
> apr_hash_this (hi, &key, &klen, &val);
> - unlock_path = svn_string_create ((char *)key, pool);
> + unlock_path = svn_stringbuf_create ((char *)key, pool);
>
> err = svn_wc__unlock (unlock_path, pool);
> if (err)
> @@ -278,7 +278,7 @@
> *newest_baton = stackptr->baton;
>
> /* Lock this youngest directory */
> - err = do_lock (svn_string_dup (stackptr->path, top_pool), locks, top_pool);
> + err = do_lock (svn_stringbuf_dup (stackptr->path, top_pool), locks, top_pool);
> if (err) return err;
>
> return SVN_NO_ERROR;
> @@ -433,7 +433,7 @@
>
> if (tb->text_modified_p)
> {
> - entrypath = svn_string_create ((char *) key, pool);
> + entrypath = svn_stringbuf_create ((char *) key, pool);
>
> err = do_apply_textdelta (entrypath, editor, tb, pool);
> if (err) return err;
> @@ -544,7 +544,7 @@
>
> if (entry->kind == svn_node_file)
> {
> - parent_dir = svn_string_dup (full_path, pool);
> + parent_dir = svn_stringbuf_dup (full_path, pool);
> svn_path_remove_component (parent_dir, svn_path_local_style);
> }
> else if (entry->kind == svn_node_dir)
> @@ -601,7 +601,7 @@
> apr_pool_t *subpool = svn_pool_create (pool);
> apr_hash_t *entries;
> apr_hash_index_t *hi;
> - svn_stringbuf_t *fullpath = svn_string_dup (dir, pool);
> + svn_stringbuf_t *fullpath = svn_stringbuf_dup (dir, pool);
>
> if ((schedule != svn_wc_schedule_delete)
> && (schedule != svn_wc_schedule_replace))
> @@ -662,7 +662,7 @@
> SVN_ERR (verify_tree_deletion (fullpath, entry->schedule, subpool));
>
> /* Reset FULLPATH to just hold this dir's name. */
> - svn_string_set (fullpath, dir->data);
> + svn_stringbuf_set (fullpath, dir->data);
>
> /* Clear our per-iteration pool. */
> svn_pool_clear (subpool);
> @@ -785,7 +785,7 @@
> if (! strcmp (keystring, SVN_WC_ENTRY_THIS_DIR))
> current_entry_name = NULL;
> else
> - current_entry_name = svn_string_create (keystring, subpool);
> + current_entry_name = svn_stringbuf_create (keystring, subpool);
> current_entry = (svn_wc_entry_t *) val;
>
> /* This entry gets deleted if all of the following hold true:
> @@ -816,12 +816,12 @@
> {
> if (! current_entry_name)
> continue; /* skip THIS_DIR */
> - if (! svn_string_compare (filename, current_entry_name))
> + if (! svn_stringbuf_compare (filename, current_entry_name))
> continue; /* skip differing entryname */
> }
>
> /* Construct a full path to the current entry */
> - full_path_to_entry = svn_string_dup (path, subpool);
> + full_path_to_entry = svn_stringbuf_dup (path, subpool);
> if (current_entry_name != NULL)
> svn_path_add_component (full_path_to_entry, current_entry_name,
> svn_path_local_style);
> @@ -873,7 +873,7 @@
> struct target_baton *tb = apr_pcalloc (top_pool, sizeof (*tb));
>
> tb->entry = svn_wc__entry_dup (current_entry, top_pool);
> - longpath = svn_string_dup (full_path_to_entry, top_pool);
> + longpath = svn_stringbuf_dup (full_path_to_entry, top_pool);
> apr_hash_set (affected_targets, longpath->data, longpath->len, tb);
> }
> } /* END DELETION CHECK */
> @@ -968,7 +968,7 @@
>
> /* Store the (added) affected-target for safe keeping
> (possibly to be used later for postfix text-deltas) */
> - longpath = svn_string_dup (full_path_to_entry, top_pool);
> + longpath = svn_stringbuf_dup (full_path_to_entry, top_pool);
> apr_hash_set (affected_targets, longpath->data, longpath->len, tb);
>
> } /* END ADDITION CHECK */
> @@ -1010,7 +1010,7 @@
>
> /* Build the full path to this entry, also from the
> top-pool. */
> - longpath = svn_string_dup (full_path_to_entry, top_pool);
> + longpath = svn_stringbuf_dup (full_path_to_entry, top_pool);
>
> /* Do what's necesary to get a baton for current directory */
> if (! dir_baton)
> @@ -1139,7 +1139,7 @@
> apr_pool_t *subpool = svn_pool_create (pool);
>
> /* Construct the actual 'fullpath' = wc_path + dir_path */
> - svn_stringbuf_t *full_path = svn_string_dup (wc_path, subpool);
> + svn_stringbuf_t *full_path = svn_stringbuf_dup (wc_path, subpool);
> svn_path_add_component (full_path, dir_path, svn_path_local_style);
>
> /* Get both the SVN Entries and the actual on-disk entries. */
> @@ -1167,8 +1167,8 @@
> {
> apr_status_t status;
>
> - current_entry_name = svn_string_create (keystring, subpool);
> - printable_path = svn_string_dup (full_path, subpool);
> + current_entry_name = svn_stringbuf_create (keystring, subpool);
> + printable_path = svn_stringbuf_dup (full_path, subpool);
> svn_path_add_component (printable_path, current_entry_name,
> svn_path_local_style);
>
> @@ -1205,10 +1205,10 @@
> if (! strcmp (keystring, SVN_WC_ENTRY_THIS_DIR))
> continue;
> else
> - current_entry_name = svn_string_create (keystring, subpool);
> + current_entry_name = svn_stringbuf_create (keystring, subpool);
>
> /* Compute the complete path of the entry, relative to dir_path. */
> - full_entry_path = svn_string_dup (dir_path, subpool);
> + full_entry_path = svn_stringbuf_dup (dir_path, subpool);
> if (current_entry_name)
> svn_path_add_component (full_entry_path, current_entry_name,
> svn_path_local_style);
> @@ -1256,7 +1256,7 @@
> {
> svn_wc_entry_t *subdir_entry;
> svn_stringbuf_t *megalong_path =
> - svn_string_dup (wc_path, subpool);
> + svn_stringbuf_dup (wc_path, subpool);
> svn_path_add_component (megalong_path, full_entry_path,
> svn_path_local_style);
> SVN_ERR (svn_wc_entry (&subdir_entry, megalong_path, subpool));
> @@ -1389,7 +1389,7 @@
> Unfortunately, report_local_mods expects "real" paths
> (i.e. either absolute, or relative to CWD.) So we prepend
> parent_dir to all the targets here. */
> - target = svn_string_dup (parent_dir, pool);
> + target = svn_stringbuf_dup (parent_dir, pool);
> svn_path_add_component (target, relative_target,
> svn_path_local_style);
>
> @@ -1433,7 +1433,7 @@
>
> svn_stringbuf_t *component =
> (((svn_stringbuf_t **) components->elts)[j]);
> - new_path = svn_string_dup (stack->path, pool);
> + new_path = svn_stringbuf_dup (stack->path, pool);
> svn_path_add_component (new_path, component,
> svn_path_local_style);
>
> @@ -1572,7 +1572,7 @@
> top-level directory being updated is at BASE_REV. Its PATH
> argument is ignored. */
> SVN_ERR (reporter->set_path (report_baton,
> - svn_string_create ("", pool),
> + svn_stringbuf_create ("", pool),
> base_rev));
>
> if (entry->kind == svn_node_dir)
> @@ -1580,7 +1580,7 @@
> /* Recursively crawl ROOT_DIRECTORY and report differing
> revisions. */
> err = report_revisions (path,
> - svn_string_create ("", pool),
> + svn_stringbuf_create ("", pool),
> base_rev,
> reporter, report_baton, fbtable, pool);
> if (err)
> @@ -1603,7 +1603,7 @@
> directory), and that target is a file, we need to pass an
> empty string to set_path. */
> err = reporter->set_path (report_baton,
> - svn_string_create ("", pool),
> + svn_stringbuf_create ("", pool),
> base_rev);
> if (err)
> {
>
>
>
> 1.81 +13 -13 subversion/subversion/libsvn_wc/adm_files.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_wc/adm_files.c.diff?r1=1.80&r2=1.81
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: adm_files.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_wc/adm_files.c,v
> retrieving revision 1.80
> retrieving revision 1.81
> diff -u -b -r1.80 -r1.81
> --- adm_files.c 2001/06/08 09:01:05 1.80
> +++ adm_files.c 2001/06/13 09:10:34 1.81
> @@ -48,7 +48,7 @@
> svn_stringbuf_t *
> svn_wc__adm_subdir (apr_pool_t *pool)
> {
> - return svn_string_create (adm_subdir (), pool);
> + return svn_stringbuf_create (adm_subdir (), pool);
> }
>
>
> @@ -133,7 +133,7 @@
> apr_pool_t *pool,
> ...)
> {
> - svn_stringbuf_t *newpath = svn_string_dup (path, pool);
> + svn_stringbuf_t *newpath = svn_stringbuf_dup (path, pool);
> va_list ap;
>
> va_start (ap, pool);
> @@ -151,7 +151,7 @@
> ...)
> {
> enum svn_node_kind kind;
> - svn_stringbuf_t *newpath = svn_string_dup (path, pool);
> + svn_stringbuf_t *newpath = svn_stringbuf_dup (path, pool);
> va_list ap;
>
> va_start (ap, pool);
> @@ -297,7 +297,7 @@
> /* Some code duplication with close_adm_file() seems unavoidable,
> given how C va_lists work. */
>
> - svn_stringbuf_t *tmp_path = svn_string_dup (path, pool);
> + svn_stringbuf_t *tmp_path = svn_stringbuf_dup (path, pool);
> apr_status_t apr_err;
> int components_added;
> va_list ap;
> @@ -402,7 +402,7 @@
>
> if (is_wc) /* It's not only a dir, it's a working copy dir */
> {
> - *prop_path = svn_string_dup (path, pool);
> + *prop_path = svn_stringbuf_dup (path, pool);
> extend_with_adm_name
> (*prop_path,
> 0,
> @@ -416,7 +416,7 @@
> svn_path_split (path, prop_path, &entry_name,
> svn_path_local_style, pool);
> if (svn_path_is_empty (*prop_path, svn_path_local_style))
> - svn_string_set (*prop_path, ".");
> + svn_stringbuf_set (*prop_path, ".");
>
> err = svn_wc_check_wc (*prop_path, &is_wc, pool);
> if (err)
> @@ -471,7 +471,7 @@
>
> if (is_wc) /* It's not only a dir, it's a working copy dir */
> {
> - *wcprop_path = svn_string_dup (path, pool);
> + *wcprop_path = svn_stringbuf_dup (path, pool);
> extend_with_adm_name
> (*wcprop_path,
> 0,
> @@ -561,8 +561,8 @@
> {
> svn_stringbuf_t *opath, *tmp_path; /* just keep it all local */
>
> - opath = svn_string_dup (path, pool);
> - tmp_path = svn_string_dup (path, pool);
> + opath = svn_stringbuf_dup (path, pool);
> + tmp_path = svn_stringbuf_dup (path, pool);
>
> va_start (ap, pool);
> v_extend_with_adm_name (opath, 0, pool, ap);
> @@ -647,7 +647,7 @@
> /* Some code duplication with sync_adm_file() seems unavoidable,
> given how C va_lists work. */
>
> - svn_stringbuf_t *tmp_path = svn_string_dup (path, pool);
> + svn_stringbuf_t *tmp_path = svn_stringbuf_dup (path, pool);
>
> /* Extend real name. */
> va_start (ap, pool);
> @@ -1151,7 +1151,7 @@
>
> /* SVN_WC__ADM_FORMAT */
> err = init_adm_file (path, SVN_WC__ADM_FORMAT,
> - svn_string_create (format_contents, pool), pool);
> + svn_stringbuf_create (format_contents, pool), pool);
> if (err)
> return err;
>
> @@ -1186,7 +1186,7 @@
> /* THIS FILE MUST BE CREATED LAST:
> After this exists, the dir is considered complete. */
> err = init_adm_file (path, SVN_WC__ADM_README,
> - svn_string_create (readme_contents, pool),
> + svn_stringbuf_create (readme_contents, pool),
> pool);
> if (err)
> return err;
> @@ -1249,7 +1249,7 @@
> (which should also remove the lock file we created above) */
> {
> apr_status_t apr_err;
> - svn_stringbuf_t *adm_path = svn_string_dup (path, pool);
> + svn_stringbuf_t *adm_path = svn_stringbuf_dup (path, pool);
>
> svn_path_add_component (adm_path, svn_wc__adm_subdir (pool),
> svn_path_local_style);
>
>
>
> 1.72 +23 -23 subversion/subversion/libsvn_wc/adm_ops.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_wc/adm_ops.c.diff?r1=1.71&r2=1.72
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: adm_ops.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_wc/adm_ops.c,v
> retrieving revision 1.71
> retrieving revision 1.72
> diff -u -b -r1.71 -r1.72
> --- adm_ops.c 2001/06/08 21:31:22 1.71
> +++ adm_ops.c 2001/06/13 09:10:34 1.72
> @@ -80,7 +80,7 @@
> struct svn_wc_close_commit_baton *cbaton =
> apr_pcalloc (subpool, sizeof (*cbaton));
> cbaton->pool = subpool;
> - cbaton->prefix_path = svn_string_create ("", subpool);
> + cbaton->prefix_path = svn_stringbuf_create ("", subpool);
>
> SVN_ERR (svn_wc_entries_read (&entries, dir_path, subpool));
>
> @@ -104,10 +104,10 @@
> if (! strcmp (keystring, SVN_WC_ENTRY_THIS_DIR))
> current_entry_name = NULL;
> else
> - current_entry_name = svn_string_create (keystring, subpool);
> + current_entry_name = svn_stringbuf_create (keystring, subpool);
>
> /* Compute the complete path of the entry */
> - full_entry_path = svn_string_dup (dir_path, subpool);
> + full_entry_path = svn_stringbuf_dup (dir_path, subpool);
> if (current_entry_name)
> svn_path_add_component (full_entry_path, current_entry_name,
> svn_path_url_style);
> @@ -147,14 +147,14 @@
> char *revstr = apr_psprintf (pool, "%ld", new_revnum);
>
> /* Construct the -full- path */
> - svn_stringbuf_t *path = svn_string_dup (bumper->prefix_path, pool);
> + svn_stringbuf_t *path = svn_stringbuf_dup (bumper->prefix_path, pool);
> svn_path_add_component (path, target, svn_path_local_style);
>
> /* Write a log file in the adm dir of path. */
>
> /* (First, try to write a logfile directly in PATH.) */
> log_parent = path;
> - basename = svn_string_create (SVN_WC_ENTRY_THIS_DIR, pool);
> + basename = svn_stringbuf_create (SVN_WC_ENTRY_THIS_DIR, pool);
> err = svn_wc__open_adm_file (&log_fp, log_parent, SVN_WC__ADM_LOG,
> (APR_WRITE | APR_APPEND | APR_CREATE),
> pool);
> @@ -165,7 +165,7 @@
> svn_path_split (path, &log_parent, &basename,
> svn_path_local_style, pool);
> if (svn_path_is_empty (log_parent, svn_path_local_style))
> - svn_string_set (log_parent, ".");
> + svn_stringbuf_set (log_parent, ".");
>
> SVN_ERR (svn_wc__open_adm_file (&log_fp, log_parent, SVN_WC__ADM_LOG,
> (APR_WRITE|APR_APPEND|APR_CREATE),
> @@ -182,7 +182,7 @@
> the parent of an empty path, we ensure that the parent
> directory is '.', and that we are looking at the "this
> dir" entry. */
> - pdir = svn_string_create (".", pool);
> + pdir = svn_stringbuf_create (".", pool);
> }
> else
> {
> @@ -210,12 +210,12 @@
> /* Regardless of whether it's a file or dir, the "main" logfile
> contains a command to bump the revision attribute (and
> timestamp.) */
> - logtag = svn_string_create ("", pool);
> + logtag = svn_stringbuf_create ("", pool);
> svn_xml_make_open_tag (&logtag, pool, svn_xml_self_closing,
> SVN_WC__LOG_COMMITTED,
> SVN_WC__LOG_ATTR_NAME, basename,
> SVN_WC__LOG_ATTR_REVISION,
> - svn_string_create (revstr, pool),
> + svn_stringbuf_create (revstr, pool),
> NULL);
>
> apr_err = apr_file_write_full (log_fp, logtag->data, logtag->len, NULL);
> @@ -253,7 +253,7 @@
> (struct svn_wc_close_commit_baton *) baton;
>
> /* Prepend the baton's prefix to the target. */
> - svn_stringbuf_t *path = svn_string_dup (ccb->prefix_path, ccb->pool);
> + svn_stringbuf_t *path = svn_stringbuf_dup (ccb->prefix_path, ccb->pool);
> svn_path_add_component (path, target, svn_path_local_style);
>
> /* And use our public interface to get the property value. */
> @@ -272,7 +272,7 @@
> (struct svn_wc_close_commit_baton *) baton;
>
> /* Prepend the baton's prefix to the target. */
> - svn_stringbuf_t *path = svn_string_dup (ccb->prefix_path, ccb->pool);
> + svn_stringbuf_t *path = svn_stringbuf_dup (ccb->prefix_path, ccb->pool);
> svn_path_add_component (path, target, svn_path_local_style);
>
> /* And use our public interface to get the property value. */
> @@ -321,7 +321,7 @@
> apr_pool_t *subpool = svn_pool_create (pool);
> apr_hash_t *entries;
> apr_hash_index_t *hi;
> - svn_stringbuf_t *fullpath = svn_string_dup (dir, pool);
> + svn_stringbuf_t *fullpath = svn_stringbuf_dup (dir, pool);
>
> /* Read the entries file for this directory. */
> SVN_ERR (svn_wc_entries_read (&entries, dir, pool));
> @@ -338,7 +338,7 @@
> /* Get the next entry */
> apr_hash_this (hi, &key, &klen, &val);
> entry = (svn_wc_entry_t *) val;
> - basename = svn_string_create ((const char *) key, subpool);
> + basename = svn_stringbuf_create ((const char *) key, subpool);
>
> if (entry->kind == svn_node_dir)
> {
> @@ -385,7 +385,7 @@
> }
>
> /* Reset FULLPATH to just hold this dir's name. */
> - svn_string_set (fullpath, dir->data);
> + svn_stringbuf_set (fullpath, dir->data);
>
> /* Clear our per-iteration pool. */
> svn_pool_clear (subpool);
> @@ -416,7 +416,7 @@
> the addition of a delete flag. */
> svn_path_split (path, &dir, &basename, svn_path_local_style, pool);
> if (svn_path_is_empty (dir, svn_path_local_style))
> - svn_string_set (dir, ".");
> + svn_stringbuf_set (dir, ".");
>
> SVN_ERR (svn_wc__entry_modify
> (dir, basename,
> @@ -454,11 +454,11 @@
> ancestor path out of there. */
> svn_path_split (dir, &parent_dir, &basename, svn_path_local_style, pool);
> if (svn_path_is_empty (parent_dir, svn_path_local_style))
> - parent_dir = svn_string_create (".", pool);
> + parent_dir = svn_stringbuf_create (".", pool);
> SVN_ERR (svn_wc_entry (&entry, parent_dir, pool));
>
> /* Derive the ancestor path for our new addition here. */
> - ancestor_path = svn_string_dup (entry->ancestor, pool);
> + ancestor_path = svn_stringbuf_dup (entry->ancestor, pool);
> svn_path_add_component (ancestor_path, basename, svn_path_repos_style);
>
> /* Make sure this new directory has an admistrative subdirectory
> @@ -549,7 +549,7 @@
> the addition of a delete flag. */
> svn_path_split (path, &dir, &basename, svn_path_local_style, pool);
> if (svn_path_is_empty (dir, svn_path_local_style))
> - svn_string_set (dir, ".");
> + svn_stringbuf_set (dir, ".");
>
> SVN_ERR (svn_wc__entry_modify
> (dir, basename,
> @@ -601,7 +601,7 @@
> the addition of a delete flag. */
> svn_path_split (path, &dir, &basename, svn_path_local_style, pool);
> if (svn_path_is_empty (dir, svn_path_local_style))
> - svn_string_set (dir, ".");
> + svn_stringbuf_set (dir, ".");
>
> SVN_ERR (svn_wc__entry_modify
> (dir, basename,
> @@ -638,7 +638,7 @@
> svn_boolean_t left_a_file = FALSE;
> apr_pool_t *subpool = svn_pool_create (pool);
> apr_hash_t *entries = NULL;
> - svn_stringbuf_t *full_path = svn_string_dup (path, pool);
> + svn_stringbuf_t *full_path = svn_stringbuf_dup (path, pool);
>
> /* NAME is either a file's basename or SVN_WC_ENTRY_THIS_DIR. */
> is_file = (strcmp (name->data, SVN_WC_ENTRY_THIS_DIR)) ? TRUE : FALSE;
> @@ -709,7 +709,7 @@
> if (! strcmp ((const char *)key, SVN_WC_ENTRY_THIS_DIR))
> current_entry_name = NULL;
> else
> - current_entry_name = svn_string_create((const char *)key, subpool);
> + current_entry_name = svn_stringbuf_create((const char *)key, subpool);
>
> if (current_entry->kind == svn_node_file)
> {
> @@ -723,9 +723,9 @@
> }
> else if (current_entry_name && (current_entry->kind == svn_node_dir))
> {
> - svn_stringbuf_t *this_dir = svn_string_create
> + svn_stringbuf_t *this_dir = svn_stringbuf_create
> (SVN_WC_ENTRY_THIS_DIR, subpool);
> - svn_stringbuf_t *entrypath = svn_string_dup (path, subpool);
> + svn_stringbuf_t *entrypath = svn_stringbuf_dup (path, subpool);
> svn_path_add_component (entrypath, current_entry_name,
> svn_path_local_style);
> err = svn_wc_remove_from_revision_control (entrypath, this_dir,
>
>
>
> 1.109 +24 -24 subversion/subversion/libsvn_wc/entries.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_wc/entries.c.diff?r1=1.108&r2=1.109
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: entries.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_wc/entries.c,v
> retrieving revision 1.108
> retrieving revision 1.109
> diff -u -b -r1.108 -r1.109
> --- entries.c 2001/06/08 21:33:57 1.108
> +++ entries.c 2001/06/13 09:10:34 1.109
> @@ -64,7 +64,7 @@
> svn_xml_normal,
> SVN_WC__ENTRIES_TOPLEVEL,
> "xmlns",
> - svn_string_create (SVN_XML_NAMESPACE, pool),
> + svn_stringbuf_create (SVN_XML_NAMESPACE, pool),
> NULL);
>
> /* Add an entry for the dir itself -- name is absent, only the
> @@ -75,9 +75,9 @@
> svn_xml_self_closing,
> SVN_WC__ENTRIES_ENTRY,
> SVN_WC_ENTRY_ATTR_KIND,
> - svn_string_create (SVN_WC__ENTRIES_ATTR_DIR_STR, pool),
> + svn_stringbuf_create (SVN_WC__ENTRIES_ATTR_DIR_STR, pool),
> SVN_WC_ENTRY_ATTR_REVISION,
> - svn_string_create (initial_revstr, pool),
> + svn_stringbuf_create (initial_revstr, pool),
> SVN_WC_ENTRY_ATTR_ANCESTOR,
> ancestor_path,
> NULL);
> @@ -386,7 +386,7 @@
> svn_stringbuf_t *name = apr_hash_get (dst->attributes,
> SVN_WC_ENTRY_ATTR_NAME,
> APR_HASH_KEY_STRING);
> - dst->ancestor = svn_string_dup (src->ancestor, pool);
> + dst->ancestor = svn_stringbuf_dup (src->ancestor, pool);
> svn_path_add_component (dst->ancestor, name,
> svn_path_repos_style);
> }
> @@ -438,7 +438,7 @@
>
> apr_hash_this (hi, &key, &keylen, &val);
> this_entry = val;
> - entryname = svn_string_ncreate (key, keylen, pool);
> + entryname = svn_stringbuf_ncreate (key, keylen, pool);
>
> if (this_entry == default_entry)
> /* THIS_DIR already has all the information it can possibly
> @@ -476,7 +476,7 @@
> if (SVN_IS_VALID_REVNUM (entry->revision))
> apr_hash_set (entry->attributes,
> SVN_WC_ENTRY_ATTR_REVISION, APR_HASH_KEY_STRING,
> - svn_string_createf (pool, "%ld", entry->revision));
> + svn_stringbuf_createf (pool, "%ld", entry->revision));
>
> /* Ancestor */
> if ((entry->ancestor) && (entry->ancestor->len))
> @@ -488,7 +488,7 @@
> switch (entry->kind)
> {
> case svn_node_dir:
> - valuestr = svn_string_create (SVN_WC__ENTRIES_ATTR_DIR_STR, pool);
> + valuestr = svn_stringbuf_create (SVN_WC__ENTRIES_ATTR_DIR_STR, pool);
> break;
>
> case svn_node_none:
> @@ -498,7 +498,7 @@
> case svn_node_file:
> case svn_node_unknown:
> default:
> - valuestr = svn_string_create (SVN_WC__ENTRIES_ATTR_FILE_STR, pool);
> + valuestr = svn_stringbuf_create (SVN_WC__ENTRIES_ATTR_FILE_STR, pool);
> break;
> }
>
> @@ -510,15 +510,15 @@
> switch (entry->schedule)
> {
> case svn_wc_schedule_add:
> - valuestr = svn_string_create (SVN_WC_ENTRY_VALUE_ADD, pool);
> + valuestr = svn_stringbuf_create (SVN_WC_ENTRY_VALUE_ADD, pool);
> break;
>
> case svn_wc_schedule_delete:
> - valuestr = svn_string_create (SVN_WC_ENTRY_VALUE_DELETE, pool);
> + valuestr = svn_stringbuf_create (SVN_WC_ENTRY_VALUE_DELETE, pool);
> break;
>
> case svn_wc_schedule_replace:
> - valuestr = svn_string_create (SVN_WC_ENTRY_VALUE_REPLACE, pool);
> + valuestr = svn_stringbuf_create (SVN_WC_ENTRY_VALUE_REPLACE, pool);
> break;
>
> case svn_wc_schedule_normal:
> @@ -535,11 +535,11 @@
> switch (entry->existence)
> {
> case svn_wc_existence_added:
> - valuestr = svn_string_create (SVN_WC_ENTRY_VALUE_ADDED, pool);
> + valuestr = svn_stringbuf_create (SVN_WC_ENTRY_VALUE_ADDED, pool);
> break;
>
> case svn_wc_existence_deleted:
> - valuestr = svn_string_create (SVN_WC_ENTRY_VALUE_DELETED, pool);
> + valuestr = svn_stringbuf_create (SVN_WC_ENTRY_VALUE_DELETED, pool);
> break;
>
> case svn_wc_existence_normal:
> @@ -553,7 +553,7 @@
> valuestr);
>
> /* Conflicted */
> - valuestr = entry->conflicted ? svn_string_create ("true", pool) : NULL;
> + valuestr = entry->conflicted ? svn_stringbuf_create ("true", pool) : NULL;
>
> apr_hash_set (entry->attributes,
> SVN_WC_ENTRY_ATTR_CONFLICTED, APR_HASH_KEY_STRING,
> @@ -703,7 +703,7 @@
> svn_path_split (path, &dir, &basename, svn_path_local_style, pool);
>
> if (svn_path_is_empty (dir, svn_path_local_style))
> - svn_string_set (dir, ".");
> + svn_stringbuf_set (dir, ".");
>
> err = svn_wc_check_wc (dir, &is_wc, pool);
> if (err)
> @@ -908,10 +908,10 @@
> don't write out the ancestor. */
> if (this_entry->ancestor)
> {
> - this_path = svn_string_dup (this_dir->ancestor, pool);
> + this_path = svn_stringbuf_dup (this_dir->ancestor, pool);
> svn_path_add_component_nts (this_path, this_entry_name,
> svn_path_repos_style);
> - if (svn_string_compare (this_path, this_entry->ancestor))
> + if (svn_stringbuf_compare (this_path, this_entry->ancestor))
> apr_hash_set (this_entry->attributes,
> SVN_WC_ENTRY_ATTR_ANCESTOR,
> APR_HASH_KEY_STRING,
> @@ -953,7 +953,7 @@
> svn_xml_make_open_tag (&bigstr, pool, svn_xml_normal,
> SVN_WC__ENTRIES_TOPLEVEL,
> "xmlns",
> - svn_string_create (SVN_XML_NAMESPACE, pool),
> + svn_stringbuf_create (SVN_XML_NAMESPACE, pool),
> NULL);
>
> /* Get a copy of the "this dir" entry for comparison purposes. */
> @@ -1410,7 +1410,7 @@
> if (err) return err;
>
> if (name == NULL)
> - name = svn_string_create (SVN_WC_ENTRY_THIS_DIR, pool);
> + name = svn_stringbuf_create (SVN_WC_ENTRY_THIS_DIR, pool);
>
> if (modify_flags & SVN_WC__ENTRY_MODIFY_SCHEDULE)
> {
> @@ -1449,7 +1449,7 @@
>
> dupentry->revision = entry->revision;
> if (entry->ancestor)
> - dupentry->ancestor = svn_string_dup (entry->ancestor, pool);
> + dupentry->ancestor = svn_stringbuf_dup (entry->ancestor, pool);
> dupentry->kind = entry->kind;
> dupentry->schedule = entry->schedule;
> dupentry->existence = entry->existence;
> @@ -1478,8 +1478,8 @@
> val = (svn_stringbuf_t *) v;
>
> /* Allocate two *new* svn_stringbuf_t's from them, out of POOL. */
> - new_keystring = svn_string_ncreate (key, klen, pool);
> - new_valstring = svn_string_dup (val, pool);
> + new_keystring = svn_stringbuf_ncreate (key, klen, pool);
> + new_valstring = svn_stringbuf_dup (val, pool);
>
> /* Store in *new* hashtable */
> apr_hash_set (dupentry->attributes,
> @@ -1613,9 +1613,9 @@
> shorter parent path is already in the hash. If it is, remove
> the original path from the hash. */
> {
> - svn_stringbuf_t *shrinking = svn_string_dup (path, pool);
> + svn_stringbuf_t *shrinking = svn_stringbuf_dup (path, pool);
> for (svn_path_remove_component (shrinking, svn_path_local_style);
> - (! svn_string_isempty (shrinking));
> + (! svn_stringbuf_isempty (shrinking));
> svn_path_remove_component (shrinking, svn_path_local_style))
> {
> if (apr_hash_get (paths, shrinking->data, shrinking->len))
>
>
>
> 1.187 +29 -29 subversion/subversion/libsvn_wc/get_editor.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_wc/get_editor.c.diff?r1=1.186&r2=1.187
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: get_editor.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_wc/get_editor.c,v
> retrieving revision 1.186
> retrieving revision 1.187
> diff -u -b -r1.186 -r1.187
> --- get_editor.c 2001/06/11 20:53:34 1.186
> +++ get_editor.c 2001/06/13 09:10:34 1.187
> @@ -132,17 +132,17 @@
> {
> /* I, the baton-in-creation, have a parent, so base my path on
> that of my parent. */
> - path = svn_string_dup (parent_baton->path, subpool);
> + path = svn_stringbuf_dup (parent_baton->path, subpool);
> }
> else
> {
> /* I am Adam. All my base are belong to me. */
> - path = svn_string_dup (eb->anchor, subpool);
> + path = svn_stringbuf_dup (eb->anchor, subpool);
> }
>
> if (name)
> {
> - d->name = svn_string_dup (name, subpool);
> + d->name = svn_stringbuf_dup (name, subpool);
> svn_path_add_component (path, name, svn_path_local_style);
> }
>
> @@ -277,7 +277,7 @@
> {
> apr_pool_t *subpool = svn_pool_create (parent_dir_baton->pool);
> struct file_baton *f = apr_pcalloc (subpool, sizeof (*f));
> - svn_stringbuf_t *path = svn_string_dup (parent_dir_baton->path,
> + svn_stringbuf_t *path = svn_stringbuf_dup (parent_dir_baton->path,
> subpool);
>
> /* Make the file's on-disk name. */
> @@ -448,7 +448,7 @@
> struct dir_baton *parent_dir_baton = parent_baton;
> apr_status_t apr_err;
> apr_file_t *log_fp = NULL;
> - svn_stringbuf_t *log_item = svn_string_create ("", parent_dir_baton->pool);
> + svn_stringbuf_t *log_item = svn_stringbuf_create ("", parent_dir_baton->pool);
>
> err = svn_wc__lock (parent_dir_baton->path, 0, parent_dir_baton->pool);
> if (err)
> @@ -559,7 +559,7 @@
> SVN_ERR (svn_wc_entry (&parent_entry,
> parent_dir_baton->path,
> parent_dir_baton->pool));
> - new_URL = svn_string_dup (parent_entry->ancestor, this_dir_baton->pool);
> + new_URL = svn_stringbuf_dup (parent_entry->ancestor, this_dir_baton->pool);
> svn_path_add_component (new_URL, name, svn_path_local_style);
>
> copyfrom_path = new_URL;
> @@ -637,11 +637,11 @@
> /* Duplicate storage of name/value pair; they should live in the
> dir baton's pool, not some pool within the editor's driver. :)
> */
> - local_name = svn_string_dup (name, db->pool);
> + local_name = svn_stringbuf_dup (name, db->pool);
> if (value)
> /* remember that value could be NULL, signifying a property
> `delete' */
> - local_value = svn_string_dup (value, db->pool);
> + local_value = svn_stringbuf_dup (value, db->pool);
> else
> local_value = NULL;
>
> @@ -698,7 +698,7 @@
> apr_file_t *log_fp = NULL;
>
> /* to hold log messages: */
> - svn_stringbuf_t *entry_accum = svn_string_create ("", db->pool);
> + svn_stringbuf_t *entry_accum = svn_stringbuf_create ("", db->pool);
>
> /* Lock down the administrative area */
> err = svn_wc__lock (db->path, 0, db->pool);
> @@ -733,10 +733,10 @@
> svn_xml_self_closing,
> SVN_WC__LOG_MODIFY_ENTRY,
> SVN_WC__LOG_ATTR_NAME,
> - svn_string_create
> + svn_stringbuf_create
> (SVN_WC_ENTRY_THIS_DIR, db->pool),
> SVN_WC_ENTRY_ATTR_REVISION,
> - svn_string_create (revision_str, db->pool),
> + svn_stringbuf_create (revision_str, db->pool),
> NULL);
>
>
> @@ -754,11 +754,11 @@
> svn_xml_self_closing,
> SVN_WC__LOG_MODIFY_ENTRY,
> SVN_WC__LOG_ATTR_NAME,
> - svn_string_create
> + svn_stringbuf_create
> (SVN_WC_ENTRY_THIS_DIR, db->pool),
> SVN_WC_ENTRY_ATTR_PROP_TIME,
> /* use wfile time */
> - svn_string_create (SVN_WC_TIMESTAMP_WC,
> + svn_stringbuf_create (SVN_WC_TIMESTAMP_WC,
> db->pool),
> NULL);
>
> @@ -993,11 +993,11 @@
> /* Duplicate storage of name/value pair; they should live in the
> file baton's pool, not some pool within the editor's driver. :)
> */
> - local_name = svn_string_dup (name, fb->pool);
> + local_name = svn_stringbuf_dup (name, fb->pool);
> if (value)
> /* remember that value could be NULL, signifying a property
> `delete' */
> - local_value = svn_string_dup (value, fb->pool);
> + local_value = svn_stringbuf_dup (value, fb->pool);
> else
> local_value = NULL;
>
> @@ -1094,7 +1094,7 @@
> if (err)
> return err;
>
> - entry_accum = svn_string_create ("", fb->pool);
> + entry_accum = svn_stringbuf_create ("", fb->pool);
>
> if (fb->text_changed)
> {
> @@ -1230,7 +1230,7 @@
> else if (wfile_kind == svn_node_file)
> {
> /* Patch repos changes into an existing local file. */
> - svn_stringbuf_t *patch_cmd = svn_string_create (SVN_CLIENT_PATCH,
> + svn_stringbuf_t *patch_cmd = svn_stringbuf_create (SVN_CLIENT_PATCH,
> fb->pool);
> apr_file_t *reject_file = NULL;
> svn_stringbuf_t *reject_filename = NULL;
> @@ -1266,12 +1266,12 @@
>
> Sometimes I think I think too much. I think.
> */
> - reject_filename = svn_string_ncreate
> + reject_filename = svn_stringbuf_ncreate
> (reject_filename->data + fb->dir_baton->path->len + 1,
> reject_filename->len - fb->dir_baton->path->len - 1,
> fb->pool);
>
> - received_diff_filename = svn_string_ncreate
> + received_diff_filename = svn_stringbuf_ncreate
> (received_diff_filename->data + fb->dir_baton->path->len + 1,
> received_diff_filename->len - fb->dir_baton->path->len - 1,
> fb->pool);
> @@ -1287,11 +1287,11 @@
> SVN_WC__LOG_ATTR_NAME,
> patch_cmd,
> SVN_WC__LOG_ATTR_ARG_1,
> - svn_string_create ("-r", fb->pool),
> + svn_stringbuf_create ("-r", fb->pool),
> SVN_WC__LOG_ATTR_ARG_2,
> reject_filename,
> SVN_WC__LOG_ATTR_ARG_3,
> - svn_string_create ("--", fb->pool),
> + svn_stringbuf_create ("--", fb->pool),
> SVN_WC__LOG_ATTR_ARG_4,
> fb->name,
> SVN_WC__LOG_ATTR_INFILE,
> @@ -1353,10 +1353,10 @@
> SVN_WC__LOG_ATTR_NAME,
> fb->name,
> SVN_WC_ENTRY_ATTR_KIND,
> - svn_string_create (SVN_WC__ENTRIES_ATTR_FILE_STR,
> + svn_stringbuf_create (SVN_WC__ENTRIES_ATTR_FILE_STR,
> fb->pool),
> SVN_WC_ENTRY_ATTR_REVISION,
> - svn_string_create (revision_str, fb->pool),
> + svn_stringbuf_create (revision_str, fb->pool),
> NULL);
>
> if (fb->text_changed)
> @@ -1380,7 +1380,7 @@
> fb->name,
> SVN_WC_ENTRY_ATTR_TEXT_TIME,
> /* use wfile time */
> - svn_string_create (SVN_WC_TIMESTAMP_WC,
> + svn_stringbuf_create (SVN_WC_TIMESTAMP_WC,
> fb->pool),
> NULL);
> }
> @@ -1406,7 +1406,7 @@
> fb->name,
> SVN_WC_ENTRY_ATTR_PROP_TIME,
> /* use wfile time */
> - svn_string_create (SVN_WC_TIMESTAMP_WC,
> + svn_stringbuf_create (SVN_WC_TIMESTAMP_WC,
> fb->pool),
> NULL);
> }
> @@ -1483,7 +1483,7 @@
> need this bumping, and only directory updates at that.
> Updated files should already be up-to-date. */
> svn_wc_entry_t *entry;
> - svn_stringbuf_t *full_path = svn_string_dup (eb->anchor, eb->pool);
> + svn_stringbuf_t *full_path = svn_stringbuf_dup (eb->anchor, eb->pool);
> if (eb->target)
> svn_path_add_component (full_path, eb->target,
> svn_path_local_style);
> @@ -1690,7 +1690,7 @@
> a basename. Trivial. */
> if (svn_path_is_empty (path, svn_path_local_style))
> {
> - *parent_dir = svn_string_dup (path, pool);
> + *parent_dir = svn_stringbuf_dup (path, pool);
> *entry = NULL;
> return SVN_NO_ERROR;
> }
> @@ -1705,7 +1705,7 @@
> {
> /* Case II: If PATH is an entry of a non-versioned directory, do
> not lop off a basename. */
> - *parent_dir = svn_string_dup (path, pool);
> + *parent_dir = svn_stringbuf_dup (path, pool);
> *entry = NULL;
> }
> else
> @@ -1714,7 +1714,7 @@
> off its basename. */
> *parent_dir = dirname;
> if (svn_path_is_empty (dirname, svn_path_local_style))
> - svn_string_set (*parent_dir, ".");
> + svn_stringbuf_set (*parent_dir, ".");
> *entry = basename;
> }
>
>
>
>
> 1.29 +1 -1 subversion/subversion/libsvn_wc/local_changes.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_wc/local_changes.c.diff?r1=1.28&r2=1.29
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: local_changes.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_wc/local_changes.c,v
> retrieving revision 1.28
> retrieving revision 1.29
> diff -u -b -r1.28 -r1.29
> --- local_changes.c 2001/06/08 09:01:06 1.28
> +++ local_changes.c 2001/06/13 09:10:34 1.29
> @@ -78,7 +78,7 @@
> exploded_time.tm_isdst,
> exploded_time.tm_gmtoff);
>
> - return svn_string_create (t_cstr, pool);
> + return svn_stringbuf_create (t_cstr, pool);
> }
>
>
>
>
>
> 1.100 +26 -26 subversion/subversion/libsvn_wc/log.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_wc/log.c.diff?r1=1.99&r2=1.100
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: log.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_wc/log.c,v
> retrieving revision 1.99
> retrieving revision 1.100
> diff -u -b -r1.99 -r1.100
> --- log.c 2001/06/08 09:01:06 1.99
> +++ log.c 2001/06/13 09:10:34 1.100
> @@ -164,8 +164,8 @@
> apr_status_t status;
> svn_stringbuf_t *full_from_path, *full_dest_path;
>
> - full_from_path = svn_string_dup (path, pool);
> - full_dest_path = svn_string_dup (path, pool);
> + full_from_path = svn_stringbuf_dup (path, pool);
> + full_dest_path = svn_stringbuf_dup (path, pool);
>
> svn_path_add_component_nts (full_from_path, name, svn_path_local_style);
> svn_path_add_component_nts (full_dest_path, dest, svn_path_local_style);
> @@ -201,7 +201,7 @@
> svn_error_t *err;
> enum svn_node_kind kind;
>
> - filepath = svn_string_dup (path, pool);
> + filepath = svn_stringbuf_dup (path, pool);
> svn_path_add_component_nts (filepath, name, svn_path_local_style);
>
> tmp_text_base = svn_wc__text_base_path (filepath, 1, pool);
> @@ -272,7 +272,7 @@
> if (infile_name)
> {
> svn_stringbuf_t *infile_path
> - = svn_string_dup (loggy->path, loggy->pool);
> + = svn_stringbuf_dup (loggy->path, loggy->pool);
> svn_path_add_component_nts (infile_path, infile_name,
> svn_path_local_style);
>
> @@ -286,7 +286,7 @@
> if (outfile_name)
> {
> svn_stringbuf_t *outfile_path
> - = svn_string_dup (loggy->path, loggy->pool);
> + = svn_stringbuf_dup (loggy->path, loggy->pool);
> svn_path_add_component_nts (outfile_path, outfile_name,
> svn_path_local_style);
>
> @@ -303,7 +303,7 @@
> if (errfile_name)
> {
> svn_stringbuf_t *errfile_path
> - = svn_string_dup (loggy->path, loggy->pool);
> + = svn_stringbuf_dup (loggy->path, loggy->pool);
> svn_path_add_component_nts (errfile_path, errfile_name,
> svn_path_local_style);
>
> @@ -363,7 +363,7 @@
> apr_status_t apr_err;
> svn_stringbuf_t *full_path;
>
> - full_path = svn_string_dup (loggy->path, loggy->pool);
> + full_path = svn_stringbuf_dup (loggy->path, loggy->pool);
> svn_path_add_component_nts (full_path, name, svn_path_local_style);
>
> apr_err = apr_file_remove (full_path->data, loggy->pool);
> @@ -396,7 +396,7 @@
> loggy->path->data);
>
>
> - full_path = svn_string_dup (loggy->path, loggy->pool);
> + full_path = svn_stringbuf_dup (loggy->path, loggy->pool);
> svn_path_add_component_nts (full_path, rejfile, svn_path_local_style);
>
> apr_err = apr_stat (&finfo, full_path->data, APR_FINFO_MIN, loggy->pool);
> @@ -424,7 +424,7 @@
>
> err = svn_wc__entry_modify
> (loggy->path,
> - svn_string_create (name, loggy->pool),
> + svn_stringbuf_create (name, loggy->pool),
> (SVN_WC__ENTRY_MODIFY_CONFLICTED | SVN_WC__ENTRY_MODIFY_ATTRIBUTES),
> SVN_INVALID_REVNUM,
> svn_node_none,
> @@ -451,8 +451,8 @@
> {
> svn_error_t *err;
> apr_hash_t *ah = svn_xml_make_att_hash (atts, loggy->pool);
> - svn_stringbuf_t *sname = svn_string_create (name, loggy->pool);
> - svn_stringbuf_t *tfile = svn_string_dup (loggy->path, loggy->pool);
> + svn_stringbuf_t *sname = svn_stringbuf_create (name, loggy->pool);
> + svn_stringbuf_t *tfile = svn_stringbuf_dup (loggy->path, loggy->pool);
> svn_wc_entry_t *entry;
> apr_uint16_t modify_flags;
> svn_stringbuf_t *valuestr;
> @@ -552,9 +552,9 @@
> {
> svn_wc_entry_t *entry;
> svn_error_t *err = NULL;
> - svn_stringbuf_t *sname = svn_string_create (name, loggy->pool);
> - svn_stringbuf_t *full_path = svn_string_dup (loggy->path, loggy->pool);
> - svn_stringbuf_t *this_dir = svn_string_create (SVN_WC_ENTRY_THIS_DIR,
> + svn_stringbuf_t *sname = svn_stringbuf_create (name, loggy->pool);
> + svn_stringbuf_t *full_path = svn_stringbuf_dup (loggy->path, loggy->pool);
> + svn_stringbuf_t *this_dir = svn_stringbuf_create (SVN_WC_ENTRY_THIS_DIR,
> loggy->pool);
>
> /* Figure out if 'name' is a dir or a file */
> @@ -610,7 +610,7 @@
> svn_stringbuf_t *rejfile_full_path;
> enum svn_node_kind kind;
>
> - rejfile_full_path = svn_string_dup (parent_dir, pool);
> + rejfile_full_path = svn_stringbuf_dup (parent_dir, pool);
> svn_path_add_component_nts (rejfile_full_path, rejfile,
> svn_path_local_style);
>
> @@ -650,7 +650,7 @@
>
> SVN_ERR (svn_wc__entry_modify
> (parent_dir,
> - svn_string_create (entry, pool),
> + svn_stringbuf_create (entry, pool),
> SVN_WC__ENTRY_MODIFY_CONFLICTED,
> SVN_INVALID_REVNUM,
> svn_node_none,
> @@ -670,11 +670,11 @@
>
> apr_hash_set (att_overlay,
> rejfile_type, APR_HASH_KEY_STRING,
> - svn_string_create (rejfile, pool));
> + svn_stringbuf_create (rejfile, pool));
>
> SVN_ERR (svn_wc__entry_modify
> (parent_dir,
> - svn_string_create (entry, pool),
> + svn_stringbuf_create (entry, pool),
> SVN_WC__ENTRY_MODIFY_CONFLICTED,
> SVN_INVALID_REVNUM,
> svn_node_none,
> @@ -748,7 +748,7 @@
> enum svn_node_kind kind;
> svn_wc_entry_t *entry;
> svn_stringbuf_t *prop_path, *tmp_prop_path, *prop_base_path;
> - svn_stringbuf_t *sname = svn_string_create (name, loggy->pool);
> + svn_stringbuf_t *sname = svn_stringbuf_create (name, loggy->pool);
> svn_boolean_t is_this_dir;
>
> /* `name' is either a file's basename, or SVN_WC_ENTRY_THIS_DIR. */
> @@ -759,7 +759,7 @@
> {
> svn_stringbuf_t *full_path;
>
> - full_path = svn_string_dup (loggy->path, loggy->pool);
> + full_path = svn_stringbuf_dup (loggy->path, loggy->pool);
> if (! is_this_dir)
> svn_path_add_component (full_path, sname, svn_path_local_style);
> SVN_ERR (svn_wc_entry (&entry, full_path, loggy->pool));
> @@ -791,7 +791,7 @@
> /* If we get here, `name' is a file's basename.
> `basename' is an svn_stringbuf_t version of it. Check
> for textual changes. */
> - working_file = svn_string_dup (loggy->path, loggy->pool);
> + working_file = svn_stringbuf_dup (loggy->path, loggy->pool);
> svn_path_add_component (working_file,
> sname,
> svn_path_local_style);
> @@ -1122,7 +1122,7 @@
> /* Blow away the entire administrative dir, and all those below
> it too. Don't remove any working files, though. */
> svn_stringbuf_t *this_dir =
> - svn_string_create (SVN_WC_ENTRY_THIS_DIR, pool);
> + svn_stringbuf_create (SVN_WC_ENTRY_THIS_DIR, pool);
> SVN_ERR (svn_wc_remove_from_revision_control (path, this_dir,
> FALSE, pool));
> }
> @@ -1171,10 +1171,10 @@
> {
> if (! care_about_this_dir)
> {
> - svn_stringbuf_t *target = svn_string_dup (path, pool);
> + svn_stringbuf_t *target = svn_stringbuf_dup (path, pool);
> svn_path_add_component
> (target,
> - svn_string_ncreate ((char *) key, keylen, pool),
> + svn_stringbuf_ncreate ((char *) key, keylen, pool),
> svn_path_local_style);
>
> if (apr_hash_get (targets, target->data, target->len))
> @@ -1187,9 +1187,9 @@
> if ((entry->kind == svn_node_dir) && (! is_this_dir))
> {
> /* Recurse */
> - svn_stringbuf_t *subdir = svn_string_dup (path, pool);
> + svn_stringbuf_t *subdir = svn_stringbuf_dup (path, pool);
> svn_path_add_component (subdir,
> - svn_string_create ((char *) key, pool),
> + svn_stringbuf_create ((char *) key, pool),
> svn_path_local_style);
>
> err = svn_wc__cleanup (subdir, targets, bail_on_lock, pool);
>
>
>
> 1.33 +26 -26 subversion/subversion/libsvn_wc/props.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_wc/props.c.diff?r1=1.32&r2=1.33
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: props.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_wc/props.c,v
> retrieving revision 1.32
> retrieving revision 1.33
> diff -u -b -r1.32 -r1.33
> --- props.c 2001/06/08 09:01:06 1.32
> +++ props.c 2001/06/13 09:10:34 1.33
> @@ -85,16 +85,16 @@
> {
> /* Add a delete event to the array */
> svn_prop_t *p = apr_pcalloc (pool, sizeof(*p));
> - p->name = svn_string_ncreate ((char *) key, klen, pool);
> + p->name = svn_stringbuf_ncreate ((char *) key, klen, pool);
> p->value = NULL;
>
> *((svn_prop_t **)apr_array_push (ary)) = p;
> }
> - else if (! svn_string_compare (propval1, propval2))
> + else if (! svn_stringbuf_compare (propval1, propval2))
> {
> /* Add a set (modification) event to the array */
> svn_prop_t *p = apr_pcalloc (pool, sizeof(*p));
> - p->name = svn_string_ncreate ((char *) key, klen, pool);
> + p->name = svn_stringbuf_ncreate ((char *) key, klen, pool);
> p->value = propval2;
>
> *((svn_prop_t **)apr_array_push (ary)) = p;
> @@ -121,7 +121,7 @@
> {
> /* Add a set (creation) event to the array */
> svn_prop_t *p = apr_pcalloc (pool, sizeof(*p));
> - p->name = svn_string_ncreate ((char *) key, klen, pool);
> + p->name = svn_stringbuf_ncreate ((char *) key, klen, pool);
> p->value = propval2;
>
> *((svn_prop_t **)apr_array_push (ary)) = p;
> @@ -168,7 +168,7 @@
> (After all, if they affect different property names, how can they
> possibly conflict?) But still, let's make this routine
> `complete' by checking anyway. */
> - if (! svn_string_compare (local->name, update->name))
> + if (! svn_stringbuf_compare (local->name, update->name))
> return FALSE; /* no conflict */
>
> /* If one change wants to delete a property and the other wants to
> @@ -177,7 +177,7 @@
> if ((local->value != NULL) && (update->value == NULL))
> {
> *description =
> - svn_string_createf
> + svn_stringbuf_createf
> (pool, "prop `%s': user set value to '%s', but update deletes it.\n",
> local->name->data, local->value->data);
> return TRUE; /* conflict */
> @@ -185,7 +185,7 @@
> if ((local->value == NULL) && (update->value != NULL))
> {
> *description =
> - svn_string_createf
> + svn_stringbuf_createf
> (pool, "prop `%s': user deleted, but update sets it to '%s'.\n",
> local->name->data, update->value->data);
> return TRUE; /* conflict */
> @@ -198,10 +198,10 @@
>
> /* If both changes set the property, it's a conflict iff the values
> are different */
> - else if (! svn_string_compare (local->value, update->value))
> + else if (! svn_stringbuf_compare (local->value, update->value))
> {
> *description =
> - svn_string_createf
> + svn_stringbuf_createf
> (pool, "prop `%s': user set to '%s', but update set to '%s'.\n",
> local->name->data, local->value->data, update->value->data);
> return TRUE; /* conflict */
> @@ -411,15 +411,15 @@
> if (name == NULL)
> {
> /* We must be merging props on the directory PATH */
> - entryname = svn_string_create (SVN_WC_ENTRY_THIS_DIR, pool);
> + entryname = svn_stringbuf_create (SVN_WC_ENTRY_THIS_DIR, pool);
> full_path = path;
> is_dir = TRUE;
> }
> else
> {
> /* We must be merging props on the file PATH/NAME */
> - entryname = svn_string_dup (name, pool);
> - full_path = svn_string_dup (path, pool);
> + entryname = svn_stringbuf_dup (name, pool);
> + full_path = svn_stringbuf_dup (path, pool);
> svn_path_add_component (full_path, name, svn_path_local_style);
> is_dir = FALSE;
> }
> @@ -475,7 +475,7 @@
> local_change =
> (((svn_prop_t **)(local_propchanges)->elts)[j]);
>
> - if (svn_string_compare (local_change->name, update_change->name))
> + if (svn_stringbuf_compare (local_change->name, update_change->name))
> {
> found_match = 1;
> break;
> @@ -521,7 +521,7 @@
> {
> /* Dealing with directory "path" */
> reject_tmp_path =
> - svn_wc__adm_path (svn_string_create ("", pool),
> + svn_wc__adm_path (svn_stringbuf_create ("", pool),
> TRUE, /* use tmp */
> pool,
> tmpname->data,
> @@ -531,7 +531,7 @@
> {
> /* Dealing with file "path/name" */
> reject_tmp_path =
> - svn_wc__adm_path (svn_string_create ("", pool),
> + svn_wc__adm_path (svn_stringbuf_create ("", pool),
> TRUE,
> pool,
> SVN_WC__ADM_PROPS,
> @@ -584,23 +584,23 @@
> that each SVN subdir remains separable when executing run_log(). */
> if (is_dir)
> {
> - tmp_prop_base = svn_wc__adm_path (svn_string_create ("", pool),
> + tmp_prop_base = svn_wc__adm_path (svn_stringbuf_create ("", pool),
> 1, /* tmp */
> pool,
> SVN_WC__ADM_DIR_PROP_BASE,
> NULL);
> - real_prop_base = svn_wc__adm_path (svn_string_create ("", pool),
> + real_prop_base = svn_wc__adm_path (svn_stringbuf_create ("", pool),
> 0, /* no tmp */
> pool,
> SVN_WC__ADM_DIR_PROP_BASE,
> NULL);
>
> - tmp_props = svn_wc__adm_path (svn_string_create ("", pool),
> + tmp_props = svn_wc__adm_path (svn_stringbuf_create ("", pool),
> 1, /* tmp */
> pool,
> SVN_WC__ADM_DIR_PROPS,
> NULL);
> - real_props = svn_wc__adm_path (svn_string_create ("", pool),
> + real_props = svn_wc__adm_path (svn_stringbuf_create ("", pool),
> 0, /* no tmp */
> pool,
> SVN_WC__ADM_DIR_PROPS,
> @@ -608,26 +608,26 @@
> }
> else
> {
> - tmp_prop_base = svn_wc__adm_path (svn_string_create ("", pool),
> + tmp_prop_base = svn_wc__adm_path (svn_stringbuf_create ("", pool),
> 1, /* tmp */
> pool,
> SVN_WC__ADM_PROP_BASE,
> name->data,
> NULL);
> - real_prop_base = svn_wc__adm_path (svn_string_create ("", pool),
> + real_prop_base = svn_wc__adm_path (svn_stringbuf_create ("", pool),
> 0, /* no tmp */
> pool,
> SVN_WC__ADM_PROP_BASE,
> name->data,
> NULL);
>
> - tmp_props = svn_wc__adm_path (svn_string_create ("", pool),
> + tmp_props = svn_wc__adm_path (svn_stringbuf_create ("", pool),
> 1, /* tmp */
> pool,
> SVN_WC__ADM_PROPS,
> name->data,
> NULL);
> - real_props = svn_wc__adm_path (svn_string_create ("", pool),
> + real_props = svn_wc__adm_path (svn_stringbuf_create ("", pool),
> 0, /* no tmp */
> pool,
> SVN_WC__ADM_PROPS,
> @@ -686,11 +686,11 @@
> /* Reserve a new .prej file *above* the SVN/ directory by
> opening and closing it. */
> svn_stringbuf_t *reserved_path;
> - svn_stringbuf_t *full_reject_path = svn_string_dup (path, pool);
> + svn_stringbuf_t *full_reject_path = svn_stringbuf_dup (path, pool);
>
> if (is_dir)
> svn_path_add_component (full_reject_path,
> - svn_string_create
> + svn_stringbuf_create
> (SVN_WC__THIS_DIR_PREJ,
> pool),
> svn_path_local_style);
> @@ -753,7 +753,7 @@
> SVN_WC__LOG_ATTR_NAME,
> entryname,
> SVN_WC_ENTRY_ATTR_CONFLICTED,
> - svn_string_create ("true", pool),
> + svn_stringbuf_create ("true", pool),
> SVN_WC_ENTRY_ATTR_PREJFILE,
> reject_path,
> NULL);
>
>
>
> 1.54 +3 -3 subversion/subversion/libsvn_wc/questions.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_wc/questions.c.diff?r1=1.53&r2=1.54
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: questions.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_wc/questions.c,v
> retrieving revision 1.53
> retrieving revision 1.54
> diff -u -b -r1.53 -r1.54
> --- questions.c 2001/06/08 09:01:06 1.53
> +++ questions.c 2001/06/13 09:10:34 1.54
> @@ -126,7 +126,7 @@
> if (kind == svn_node_dir)
> {
> dirpath = path;
> - entryname = svn_string_create (SVN_WC_ENTRY_THIS_DIR, pool);
> + entryname = svn_stringbuf_create (SVN_WC_ENTRY_THIS_DIR, pool);
> }
> else
> svn_path_split (path, &dirpath, &entryname, svn_path_local_style, pool);
> @@ -584,7 +584,7 @@
>
> if (rej_file)
> {
> - rej_path = svn_string_dup (dir_path, pool);
> + rej_path = svn_stringbuf_dup (dir_path, pool);
> svn_path_add_component (rej_path, rej_file,
> svn_path_local_style);
>
> @@ -604,7 +604,7 @@
>
> if (prej_file)
> {
> - prej_path = svn_string_dup (dir_path, pool);
> + prej_path = svn_stringbuf_dup (dir_path, pool);
> svn_path_add_component (prej_path, prej_file,
> svn_path_local_style);
>
>
>
>
> 1.35 +2 -2 subversion/subversion/libsvn_wc/status.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_wc/status.c.diff?r1=1.34&r2=1.35
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: status.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_wc/status.c,v
> retrieving revision 1.34
> retrieving revision 1.35
> diff -u -b -r1.34 -r1.35
> --- status.c 2001/06/08 09:01:06 1.34
> +++ status.c 2001/06/13 09:10:34 1.35
> @@ -134,7 +134,7 @@
>
> if (entry->kind == svn_node_file)
> {
> - parent_dir = svn_string_dup (path, pool);
> + parent_dir = svn_stringbuf_dup (path, pool);
> svn_path_remove_component (parent_dir, svn_path_local_style);
> }
> else if (entry->kind == svn_node_dir)
> @@ -273,7 +273,7 @@
> void *val;
> const char *basename;
> apr_size_t keylen;
> - svn_stringbuf_t *fullpath = svn_string_dup (path, pool);
> + svn_stringbuf_t *fullpath = svn_stringbuf_dup (path, pool);
>
> /* Get the next dirent */
> apr_hash_this (hi, &key, &keylen, &val);
>
>
>
> 1.19 +3 -3 subversion/subversion/libsvn_wc/util.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/libsvn_wc/util.c.diff?r1=1.18&r2=1.19
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: util.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/libsvn_wc/util.c,v
> retrieving revision 1.18
> retrieving revision 1.19
> diff -u -b -r1.18 -r1.19
> --- util.c 2001/06/08 09:01:06 1.18
> +++ util.c 2001/06/13 09:10:34 1.19
> @@ -33,7 +33,7 @@
> svn_wc__ensure_directory (svn_stringbuf_t *path, apr_pool_t *pool)
> {
> enum svn_node_kind kind;
> - svn_stringbuf_t *npath = svn_string_dup (path, pool);
> + svn_stringbuf_t *npath = svn_stringbuf_dup (path, pool);
> svn_error_t *err = svn_io_check_path (npath, &kind, pool);
>
> if (err)
> @@ -67,10 +67,10 @@
> /* Okay, so the problem is a missing intermediate
> directory. We don't know which one, so we recursively
> back up one level and try again. */
> - svn_stringbuf_t *shorter = svn_string_dup (npath, pool);
> + svn_stringbuf_t *shorter = svn_stringbuf_dup (npath, pool);
> svn_path_remove_component (shorter, svn_path_local_style);
>
> - if (svn_string_isempty (shorter))
> + if (svn_stringbuf_isempty (shorter))
> {
> /* A weird and probably rare situation. */
> return svn_error_create (0, 0, NULL, pool,
>
>
>
> 1.8 +2 -2 subversion/subversion/mod_dav_svn/activity.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/mod_dav_svn/activity.c.diff?r1=1.7&r2=1.8
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: activity.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/mod_dav_svn/activity.c,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -b -r1.7 -r1.8
> --- activity.c 2001/06/08 09:01:07 1.7
> +++ activity.c 2001/06/13 09:10:35 1.8
> @@ -38,7 +38,7 @@
> apr_datum_t value;
> const char *txn_name;
>
> - pathname = svn_string_create(repos->fs_path, repos->pool);
> + pathname = svn_stringbuf_create(repos->fs_path, repos->pool);
> svn_path_add_component_nts(pathname, ACTIVITY_DB, svn_path_local_style);
> status = apr_dbm_open(&dbm, pathname->data, APR_DBM_READONLY,
> APR_OS_DEFAULT, repos->pool);
> @@ -77,7 +77,7 @@
> apr_datum_t key;
> apr_datum_t value;
>
> - pathname = svn_string_create(repos->fs_path, repos->pool);
> + pathname = svn_stringbuf_create(repos->fs_path, repos->pool);
> svn_path_add_component_nts(pathname, ACTIVITY_DB, svn_path_local_style);
> status = apr_dbm_open(&dbm, pathname->data, APR_DBM_RWCREATE,
> APR_OS_DEFAULT, repos->pool);
>
>
>
> 1.22 +1 -1 subversion/subversion/mod_dav_svn/liveprops.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/mod_dav_svn/liveprops.c.diff?r1=1.21&r2=1.22
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: liveprops.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/mod_dav_svn/liveprops.c,v
> retrieving revision 1.21
> retrieving revision 1.22
> diff -u -b -r1.21 -r1.22
> --- liveprops.c 2001/06/08 09:01:07 1.21
> +++ liveprops.c 2001/06/13 09:10:35 1.22
> @@ -205,7 +205,7 @@
> }
>
> stable_id = svn_fs_unparse_id(id, p);
> - svn_string_appendcstr(stable_id, resource->info->repos_path);
> + svn_stringbuf_appendcstr(stable_id, resource->info->repos_path);
>
> value = dav_svn_build_uri(resource->info->repos,
> DAV_SVN_BUILD_URI_VERSION,
>
>
>
> 1.14 +2 -2 subversion/subversion/mod_dav_svn/merge.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/mod_dav_svn/merge.c.diff?r1=1.13&r2=1.14
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: merge.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/mod_dav_svn/merge.c,v
> retrieving revision 1.13
> retrieving revision 1.14
> diff -u -b -r1.13 -r1.14
> --- merge.c 2001/06/11 02:22:08 1.13
> +++ merge.c 2001/06/13 09:10:35 1.14
> @@ -122,7 +122,7 @@
> SVN_ERR( svn_fs_node_id(&id, mrc->root, baton->path, baton->pool) );
>
> stable_id = svn_fs_unparse_id(id, baton->pool);
> - svn_string_appendcstr(stable_id, baton->path);
> + svn_stringbuf_appendcstr(stable_id, baton->path);
>
> vsn_url = dav_svn_build_uri(mrc->repos, DAV_SVN_BUILD_URI_VERSION,
> SVN_INVALID_REVNUM, stable_id->data,
> @@ -401,7 +401,7 @@
> mrc.repos = repos;
>
> /* ### grumble */
> - rootpath = svn_string_create("/", pool);
> + rootpath = svn_stringbuf_create("/", pool);
>
> serr = svn_repos_dir_delta(previous_root, rootpath, revs,
> committed_root, rootpath,
>
>
>
> 1.53 +15 -15 subversion/subversion/mod_dav_svn/repos.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/mod_dav_svn/repos.c.diff?r1=1.52&r2=1.53
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: repos.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/mod_dav_svn/repos.c,v
> retrieving revision 1.52
> retrieving revision 1.53
> diff -u -b -r1.52 -r1.53
> --- repos.c 2001/06/11 02:22:08 1.52
> +++ repos.c 2001/06/13 09:10:35 1.53
> @@ -760,7 +760,7 @@
> break;
> /* assert: defn->name != NULL */
>
> - path = svn_string_createf(base->pool, "/%s/%s",
> + path = svn_stringbuf_createf(base->pool, "/%s/%s",
> base->info->repos->special_uri, defn->name);
>
> comb = apr_pcalloc(base->pool, sizeof(*comb));
> @@ -878,7 +878,7 @@
> lifetime to store here. */
> /* ### that comment no longer applies. we're creating a string with its
> ### own lifetime now. so WHY are we using a string? hmm... */
> - comb->priv.uri_path = svn_string_create(relative, r->pool);
> + comb->priv.uri_path = svn_stringbuf_create(relative, r->pool);
>
> /* initialize this until we put something real here */
> comb->priv.root.rev = SVN_INVALID_REVNUM;
> @@ -1027,7 +1027,7 @@
>
> /* ### what if the same resource were reached via two URIs? */
>
> - return svn_string_compare(res1->info->uri_path, res2->info->uri_path);
> + return svn_stringbuf_compare(res1->info->uri_path, res2->info->uri_path);
> }
>
> static int dav_svn_is_parent_resource(const dav_resource *res1,
> @@ -1449,9 +1449,9 @@
> /* append "/" to the paths, in preparation for appending child names.
> don't add "/" if the paths are simply "/" */
> if (ctx->info.uri_path->data[ctx->info.uri_path->len - 1] != '/')
> - svn_string_appendcstr(ctx->info.uri_path, "/");
> + svn_stringbuf_appendcstr(ctx->info.uri_path, "/");
> if (ctx->repos_path->data[ctx->repos_path->len - 1] != '/')
> - svn_string_appendcstr(ctx->repos_path, "/");
> + svn_stringbuf_appendcstr(ctx->repos_path, "/");
>
> /* NOTE: the URI should already have a trailing "/" */
>
> @@ -1496,9 +1496,9 @@
> }
>
> /* append this child to our buffers */
> - svn_string_appendbytes(ctx->info.uri_path, key, klen);
> - svn_string_appendbytes(ctx->uri, key, klen);
> - svn_string_appendbytes(ctx->repos_path, key, klen);
> + svn_stringbuf_appendbytes(ctx->info.uri_path, key, klen);
> + svn_stringbuf_appendbytes(ctx->uri, key, klen);
> + svn_stringbuf_appendbytes(ctx->repos_path, key, klen);
>
> /* reset the pointers since the above may have changed them */
> ctx->res.uri = ctx->uri->data;
> @@ -1523,7 +1523,7 @@
> ctx->res.collection = TRUE;
>
> /* append a slash to the URI (the path doesn't need it yet) */
> - svn_string_appendcstr(ctx->uri, "/");
> + svn_stringbuf_appendcstr(ctx->uri, "/");
> ctx->res.uri = ctx->uri->data;
>
> /* recurse on this collection */
> @@ -1567,21 +1567,21 @@
>
> /* Don't monkey with the path from params->root. Create a new one.
> This path will then be extended/shortened as necessary. */
> - ctx.info.uri_path = svn_string_dup(ctx.info.uri_path, params->pool);
> + ctx.info.uri_path = svn_stringbuf_dup(ctx.info.uri_path, params->pool);
>
> /* prep the URI buffer */
> - ctx.uri = svn_string_create(params->root->uri, params->pool);
> + ctx.uri = svn_stringbuf_create(params->root->uri, params->pool);
>
> /* same for repos_path */
> if (ctx.info.repos_path == NULL)
> ctx.repos_path = NULL;
> else
> - ctx.repos_path = svn_string_create(ctx.info.repos_path, params->pool);
> + ctx.repos_path = svn_stringbuf_create(ctx.info.repos_path, params->pool);
>
> /* if we have a collection, then ensure the URI has a trailing "/" */
> /* ### get_resource always kills the trailing slash... */
> if (ctx.res.collection && ctx.uri->data[ctx.uri->len - 1] != '/') {
> - svn_string_appendcstr(ctx.uri, "/");
> + svn_stringbuf_appendcstr(ctx.uri, "/");
> }
>
> /* the current resource's URI is stored in the (telescoping) ctx.uri */
> @@ -1610,11 +1610,11 @@
> svn_stringbuf_t *path;
>
> if (base->baselined)
> - path = svn_string_createf(base->pool, "/%s/wbl/%s/%ld",
> + path = svn_stringbuf_createf(base->pool, "/%s/wbl/%s/%ld",
> base->info->repos->special_uri,
> activity_id, base->info->root.rev);
> else
> - path = svn_string_createf(base->pool, "/%s/wrk/%s%s",
> + path = svn_stringbuf_createf(base->pool, "/%s/wrk/%s%s",
> base->info->repos->special_uri,
> activity_id, base->info->repos_path);
>
>
>
>
> 1.6 +4 -4 subversion/subversion/mod_dav_svn/update.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/mod_dav_svn/update.c.diff?r1=1.5&r2=1.6
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: update.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/mod_dav_svn/update.c,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -b -r1.5 -r1.6
> --- update.c 2001/06/11 02:22:08 1.5
> +++ update.c 2001/06/13 09:10:35 1.6
> @@ -105,7 +105,7 @@
> }
>
> stable_id = svn_fs_unparse_id(id, baton->pool);
> - svn_string_appendcstr(stable_id, baton->path);
> + svn_stringbuf_appendcstr(stable_id, baton->path);
>
> href = dav_svn_build_uri(baton->uc->resource->info->repos,
> DAV_SVN_BUILD_URI_VERSION,
> @@ -404,7 +404,7 @@
> {
> }
>
> - fs_base = svn_string_create(resource->info->repos_path, resource->pool);
> + fs_base = svn_stringbuf_create(resource->info->repos_path, resource->pool);
> serr = svn_repos_begin_report(&rbaton, revnum,
> resource->info->repos->fs, fs_base,
> editor, &uc, resource->pool);
> @@ -416,7 +416,7 @@
> }
>
> /* ### move this into svn_string.h */
> -#define MAKE_BUFFER(p) svn_string_ncreate("", 0, (p))
> +#define MAKE_BUFFER(p) svn_stringbuf_ncreate("", 0, (p))
> pathstr = MAKE_BUFFER(resource->pool);
>
> /* scan the XML doc for state information */
> @@ -431,7 +431,7 @@
>
> path = dav_xml_get_cdata(child, resource->pool, 1 /* strip_white */);
>
> - svn_string_set(pathstr, path);
> + svn_stringbuf_set(pathstr, path);
> serr = svn_repos_set_path(rbaton, pathstr, rev);
> if (serr != NULL)
> {
>
>
>
> 1.5 +10 -10 subversion/subversion/tests/fs-helpers.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/fs-helpers.c.diff?r1=1.4&r2=1.5
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: fs-helpers.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/fs-helpers.c,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -b -r1.4 -r1.5
> --- fs-helpers.c 2001/06/08 21:31:22 1.4
> +++ fs-helpers.c 2001/06/13 09:10:35 1.5
> @@ -97,7 +97,7 @@
> {
> char buf[50];
> apr_size_t len;
> - svn_stringbuf_t *str = svn_string_create ("", pool);
> + svn_stringbuf_t *str = svn_stringbuf_create ("", pool);
>
> do
> {
> @@ -106,7 +106,7 @@
> SVN_ERR (svn_stream_read (stream, buf, &len));
>
> /* Now copy however many bytes were *actually* read into str. */
> - svn_string_appendbytes (str, buf, len);
> + svn_stringbuf_appendbytes (str, buf, len);
>
> } while (len); /* Continue until we're told that no bytes were
> read. */
> @@ -123,7 +123,7 @@
> {
> svn_txdelta_window_handler_t consumer_func;
> void *consumer_baton;
> - svn_stringbuf_t *wstring = svn_string_create (contents, pool);
> + svn_stringbuf_t *wstring = svn_stringbuf_create (contents, pool);
>
> SVN_ERR (svn_fs_apply_textdelta (&consumer_func, &consumer_baton,
> root, path, pool));
> @@ -179,9 +179,9 @@
>
> /* Calculate the full path of this entry (by appending the name
> to the path thus far) */
> - full_path = svn_string_dup (path, pool);
> + full_path = svn_stringbuf_dup (path, pool);
> svn_path_add_component (full_path,
> - svn_string_create (dirent->name, pool),
> + svn_stringbuf_create (dirent->name, pool),
> svn_path_repos_style);
>
> /* Now, copy this dirent to the master hash, but this time, use
> @@ -221,8 +221,8 @@
> {
> SVN_ERR (svn_fs_file_contents (&rstream, root, entry->path, pool));
> SVN_ERR (svn_test__stream_to_string (&rstring, rstream, pool));
> - if (! svn_string_compare (rstring,
> - svn_string_create (entry->contents, pool)))
> + if (! svn_stringbuf_compare (rstring,
> + svn_stringbuf_create (entry->contents, pool)))
> return svn_error_createf
> (SVN_ERR_FS_GENERAL, 0, NULL, pool,
> "node `%s' in tree had unexpected contents",
> @@ -247,7 +247,7 @@
> apr_hash_t *tree_entries;
> int i;
> apr_pool_t *subpool = svn_pool_create (pool);
> - svn_stringbuf_t *root_dir = svn_string_create ("", subpool);
> + svn_stringbuf_t *root_dir = svn_stringbuf_create ("", subpool);
>
> /* Create our master hash for storing the entries */
> tree_entries = apr_hash_make (pool);
> @@ -372,8 +372,8 @@
> SVN_ERR (svn_fs_file_contents (&rstream, root,
> file_contents[i][0], pool));
> SVN_ERR (svn_test__stream_to_string (&rstring, rstream, pool));
> - content = svn_string_create (file_contents[i][1], pool);
> - if (! svn_string_compare (rstring, content))
> + content = svn_stringbuf_create (file_contents[i][1], pool);
> + if (! svn_stringbuf_compare (rstring, content))
> return svn_error_createf (SVN_ERR_FS_GENERAL, 0, NULL, pool,
> "data read != data written in file `%s'.",
> file_contents[i][0]);
>
>
>
> 1.26 +37 -37 subversion/subversion/tests/svn_test_editor.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/svn_test_editor.c.diff?r1=1.25&r2=1.26
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: svn_test_editor.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/svn_test_editor.c,v
> retrieving revision 1.25
> retrieving revision 1.26
> diff -u -b -r1.25 -r1.26
> --- svn_test_editor.c 2001/06/08 09:01:07 1.25
> +++ svn_test_editor.c 2001/06/13 09:10:35 1.26
> @@ -63,7 +63,7 @@
> apr_size_t len;
>
> if (! eb->newline)
> - eb->newline = svn_string_create ("\n", eb->pool);
> + eb->newline = svn_stringbuf_create ("\n", eb->pool);
>
> len = eb->newline->len;
> return svn_stream_write (eb->out_stream, eb->newline->data, &len);
> @@ -105,12 +105,12 @@
> return SVN_NO_ERROR;
>
> if (window)
> - str = svn_string_createf (pool,
> + str = svn_stringbuf_createf (pool,
> "[%s] window_handler (%ld ops)\n",
> fb->dir_baton->edit_baton->editor_name->data,
> (long int) window->num_ops);
> else
> - str = svn_string_createf (pool,
> + str = svn_stringbuf_createf (pool,
> "[%s] window_handler (EOT)\n",
> fb->dir_baton->edit_baton->editor_name->data);
>
> @@ -125,7 +125,7 @@
> {
> case svn_txdelta_new:
> {
> - str = svn_string_createf
> + str = svn_stringbuf_createf
> (pool,
> "(%ld) new text: length %ld\n",
> (long int) i,
> @@ -138,7 +138,7 @@
> }
> case svn_txdelta_source:
> {
> - str = svn_string_createf
> + str = svn_stringbuf_createf
> (pool,
> "(%ld) source text: offset %ld, length %ld\n",
> (long int) i,
> @@ -153,7 +153,7 @@
> }
> case svn_txdelta_target:
> {
> - str = svn_string_createf
> + str = svn_stringbuf_createf
> (pool,
> "(%ld) target text: offset %ld, length %ld\n",
> (long int) i,
> @@ -168,7 +168,7 @@
> }
> default:
> {
> - str = svn_string_createf
> + str = svn_stringbuf_createf
> (pool,
> "(%ld) unknown window type\n",
> (long int) i);
> @@ -196,9 +196,9 @@
> svn_stringbuf_t *path;
> svn_stringbuf_t *str;
>
> - path = svn_string_dup (d->path, d->edit_baton->pool);
> + path = svn_stringbuf_dup (d->path, d->edit_baton->pool);
> svn_path_add_component (path, filename, d->edit_baton->style);
> - str = svn_string_createf (d->edit_baton->pool,
> + str = svn_stringbuf_createf (d->edit_baton->pool,
> "[%s] delete_entry (%s)\n",
> d->edit_baton->editor_name->data,
> path->data);
> @@ -218,7 +218,7 @@
> struct edit_baton *eb = (struct edit_baton *) edit_baton;
> svn_stringbuf_t *str;
>
> - str = svn_string_createf (eb->pool,
> + str = svn_stringbuf_createf (eb->pool,
> "[%s] set_target_revision (%ld)\n",
> eb->editor_name->data,
> (long int) target_revision);
> @@ -240,12 +240,12 @@
> struct dir_baton *d = apr_pcalloc (eb->pool, sizeof (*d));
> svn_stringbuf_t *str;
>
> - d->path = (svn_stringbuf_t *) svn_string_dup (eb->root_path, eb->pool);
> + d->path = (svn_stringbuf_t *) svn_stringbuf_dup (eb->root_path, eb->pool);
> d->edit_baton = eb;
> d->indent_level = 0;
> *root_baton = d;
>
> - str = svn_string_createf (eb->pool,
> + str = svn_stringbuf_createf (eb->pool,
> "[%s] replace_root (%s)\n",
> eb->editor_name->data,
> eb->root_path->data);
> @@ -255,7 +255,7 @@
> if (! eb->verbose)
> return SVN_NO_ERROR;
>
> - str = svn_string_createf (eb->pool,
> + str = svn_stringbuf_createf (eb->pool,
> "base_revision: %ld\n",
> (long int) base_revision);
> SVN_ERR (print (eb, d->indent_level, str));
> @@ -278,13 +278,13 @@
> svn_stringbuf_t *str;
>
> /* Set child_baton to a new dir baton. */
> - d->path = svn_string_dup (pd->path, pd->edit_baton->pool);
> + d->path = svn_stringbuf_dup (pd->path, pd->edit_baton->pool);
> svn_path_add_component (d->path, name, pd->edit_baton->style);
> d->edit_baton = pd->edit_baton;
> d->indent_level = (pd->indent_level + 1);
> *child_baton = d;
>
> - str = svn_string_createf (pd->edit_baton->pool,
> + str = svn_stringbuf_createf (pd->edit_baton->pool,
> "[%s] %s_directory (%s)\n",
> pd->edit_baton->editor_name->data,
> pivot_string,
> @@ -296,18 +296,18 @@
> if (! pd->edit_baton->verbose)
> return SVN_NO_ERROR;
>
> - str = svn_string_createf (pd->edit_baton->pool,
> + str = svn_stringbuf_createf (pd->edit_baton->pool,
> "parent: %s\n", pd->path->data);
> SVN_ERR (print (d->edit_baton, d->indent_level, str));
>
> if (strcmp (pivot_string, "add") == 0)
> {
> - str = svn_string_createf (pd->edit_baton->pool,
> + str = svn_stringbuf_createf (pd->edit_baton->pool,
> "copyfrom_path: %s\n",
> base_path ? base_path->data : "");
> SVN_ERR (print (d->edit_baton, d->indent_level, str));
>
> - str = svn_string_createf (pd->edit_baton->pool,
> + str = svn_stringbuf_createf (pd->edit_baton->pool,
> "copyfrom_revision: %ld\n",
> (long int) base_revision);
> SVN_ERR (print (d->edit_baton, d->indent_level, str));
> @@ -315,7 +315,7 @@
> }
> else
> {
> - str = svn_string_createf (pd->edit_baton->pool,
> + str = svn_stringbuf_createf (pd->edit_baton->pool,
> "base_revision: %ld\n",
> (long int) base_revision);
> SVN_ERR (print (d->edit_baton, d->indent_level, str));
> @@ -364,7 +364,7 @@
> struct dir_baton *d = (struct dir_baton *) dir_baton;
> svn_stringbuf_t *str;
>
> - str = svn_string_createf (d->edit_baton->pool,
> + str = svn_stringbuf_createf (d->edit_baton->pool,
> "[%s] close_directory (%s)\n",
> d->edit_baton->editor_name->data,
> d->path->data);
> @@ -383,7 +383,7 @@
> struct file_baton *fb = (struct file_baton *) file_baton;
> svn_stringbuf_t *str;
>
> - str = svn_string_createf (fb->dir_baton->edit_baton->pool,
> + str = svn_stringbuf_createf (fb->dir_baton->edit_baton->pool,
> "[%s] close_file (%s)\n",
> fb->dir_baton->edit_baton->editor_name->data,
> fb->path->data);
> @@ -402,7 +402,7 @@
> struct edit_baton *eb = edit_baton;
> svn_stringbuf_t *str;
>
> - str = svn_string_createf (eb->pool,
> + str = svn_stringbuf_createf (eb->pool,
> "[%s] close_edit\n",
> eb->editor_name->data);
> SVN_ERR (print (eb, 0, str));
> @@ -426,7 +426,7 @@
> *handler = my_vcdiff_windoweater;
> *handler_baton = fb;
>
> - str = svn_string_createf (fb->dir_baton->edit_baton->pool,
> + str = svn_stringbuf_createf (fb->dir_baton->edit_baton->pool,
> "[%s] apply_textdelta (%s)\n",
> fb->dir_baton->edit_baton->editor_name->data,
> fb->path->data);
> @@ -453,12 +453,12 @@
>
> /* Put the filename in file_baton */
> fb->dir_baton = d;
> - fb->path = (svn_stringbuf_t *) svn_string_dup (d->path, d->edit_baton->pool);
> + fb->path = (svn_stringbuf_t *) svn_stringbuf_dup (d->path, d->edit_baton->pool);
> svn_path_add_component (fb->path, name, d->edit_baton->style);
> fb->indent_level = (d->indent_level + 1);
> *file_baton = fb;
>
> - str = svn_string_createf (d->edit_baton->pool,
> + str = svn_stringbuf_createf (d->edit_baton->pool,
> "[%s] %s_file (%s)\n",
> d->edit_baton->editor_name->data,
> pivot_string,
> @@ -470,25 +470,25 @@
> if (! d->edit_baton->verbose)
> return SVN_NO_ERROR;
>
> - str = svn_string_createf (d->edit_baton->pool,
> + str = svn_stringbuf_createf (d->edit_baton->pool,
> "parent: %s\n", d->path->data);
> SVN_ERR (print (fb->dir_baton->edit_baton, fb->indent_level, str));
>
> if (strcmp (pivot_string, "add") == 0)
> {
> - str = svn_string_createf (d->edit_baton->pool,
> + str = svn_stringbuf_createf (d->edit_baton->pool,
> "copyfrom_path: %s\n",
> base_path ? base_path->data : "");
> SVN_ERR (print (fb->dir_baton->edit_baton, fb->indent_level, str));
>
> - str = svn_string_createf (d->edit_baton->pool,
> + str = svn_stringbuf_createf (d->edit_baton->pool,
> "copyfrom_revision: %ld\n",
> (long int) base_revision);
> SVN_ERR (print (fb->dir_baton->edit_baton, fb->indent_level, str));
> }
> else
> {
> - str = svn_string_createf (d->edit_baton->pool,
> + str = svn_stringbuf_createf (d->edit_baton->pool,
> "base_revision: %ld\n",
> (long int) base_revision);
> SVN_ERR (print (fb->dir_baton->edit_baton, fb->indent_level, str));
> @@ -538,7 +538,7 @@
> struct file_baton *fb = (struct file_baton *) file_baton;
> svn_stringbuf_t *str;
>
> - str = svn_string_createf (fb->dir_baton->edit_baton->pool,
> + str = svn_stringbuf_createf (fb->dir_baton->edit_baton->pool,
> "[%s] change_file_prop (%s)\n",
> fb->dir_baton->edit_baton->editor_name->data,
> fb->path->data);
> @@ -548,12 +548,12 @@
> if (! fb->dir_baton->edit_baton->verbose)
> return SVN_NO_ERROR;
>
> - str = svn_string_createf (fb->dir_baton->edit_baton->pool,
> + str = svn_stringbuf_createf (fb->dir_baton->edit_baton->pool,
> "name: %s\n",
> name->data);
> SVN_ERR (print (fb->dir_baton->edit_baton, fb->indent_level + 1, str));
>
> - str = svn_string_createf (fb->dir_baton->edit_baton->pool,
> + str = svn_stringbuf_createf (fb->dir_baton->edit_baton->pool,
> "value: %s\n",
> value ? value->data : "(null)");
> SVN_ERR (print (fb->dir_baton->edit_baton, fb->indent_level + 1, str));
> @@ -571,7 +571,7 @@
> struct dir_baton *d = (struct dir_baton *) parent_baton;
> svn_stringbuf_t *str;
>
> - str = svn_string_createf (d->edit_baton->pool,
> + str = svn_stringbuf_createf (d->edit_baton->pool,
> "[%s] change_dir_prop (%s)\n",
> d->edit_baton->editor_name->data,
> d->path->data);
> @@ -581,12 +581,12 @@
> if (! d->edit_baton->verbose)
> return SVN_NO_ERROR;
>
> - str = svn_string_createf (d->edit_baton->pool,
> + str = svn_stringbuf_createf (d->edit_baton->pool,
> "name: %s\n",
> name->data);
> SVN_ERR (print (d->edit_baton, d->indent_level + 1, str));
>
> - str = svn_string_createf (d->edit_baton->pool,
> + str = svn_stringbuf_createf (d->edit_baton->pool,
> "value: %s\n",
> value ? value->data : "(null)");
> SVN_ERR (print (d->edit_baton, d->indent_level + 1, str));
> @@ -634,8 +634,8 @@
>
> /* Set up the edit baton. */
> my_edit_baton = apr_pcalloc (pool, sizeof (*my_edit_baton));
> - my_edit_baton->root_path = svn_string_dup (path, pool);
> - my_edit_baton->editor_name = svn_string_dup (editor_name, pool);
> + my_edit_baton->root_path = svn_stringbuf_dup (path, pool);
> + my_edit_baton->editor_name = svn_stringbuf_dup (editor_name, pool);
> my_edit_baton->pool = pool;
> my_edit_baton->style = style;
> my_edit_baton->indentation = indentation;
>
>
>
> 1.72 +2 -2 subversion/subversion/tests/libsvn_delta/deltaparse-test.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/libsvn_delta/deltaparse-test.c.diff?r1=1.71&r2=1.72
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: deltaparse-test.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/libsvn_delta/deltaparse-test.c,v
> retrieving revision 1.71
> retrieving revision 1.72
> diff -u -b -r1.71 -r1.72
> --- deltaparse-test.c 2001/06/08 21:31:22 1.71
> +++ deltaparse-test.c 2001/06/13 09:10:35 1.72
> @@ -67,7 +67,7 @@
> }
>
> /* Set context variable for evaluating a tree-delta */
> - base_path = svn_string_create ("/root", globalpool);
> + base_path = svn_stringbuf_create ("/root", globalpool);
>
> /* Set up a stream to print to stdout. */
> out_stream = svn_stream_from_stdio (stdout, globalpool);
> @@ -75,7 +75,7 @@
> /* Grab the "test" editor and baton */
> err = svn_test_get_editor (&editor,
> &edit_baton,
> - svn_string_create ("DELTAPARSE-TEST",
> + svn_stringbuf_create ("DELTAPARSE-TEST",
> globalpool),
> out_stream,
> 3,
>
>
>
> 1.17 +7 -7 subversion/subversion/tests/libsvn_delta/xml-output-test.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/libsvn_delta/xml-output-test.c.diff?r1=1.16&r2=1.17
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: xml-output-test.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/libsvn_delta/xml-output-test.c,v
> retrieving revision 1.16
> retrieving revision 1.17
> diff -u -b -r1.16 -r1.17
> --- xml-output-test.c 2001/06/08 21:31:22 1.16
> +++ xml-output-test.c 2001/06/13 09:10:35 1.17
> @@ -43,12 +43,12 @@
>
> apr_initialize();
> pool = svn_pool_create (NULL);
> - foo_string = svn_string_create ("foo", pool);
> - bar_string = svn_string_create ("bar", pool);
> - baz_string = svn_string_create ("baz", pool);
> - aaa_string = svn_string_create ("aaa", pool);
> - bbb_string = svn_string_create ("bbb", pool);
> - ccc_string = svn_string_create ("ccc", pool);
> + foo_string = svn_stringbuf_create ("foo", pool);
> + bar_string = svn_stringbuf_create ("bar", pool);
> + baz_string = svn_stringbuf_create ("baz", pool);
> + aaa_string = svn_stringbuf_create ("aaa", pool);
> + bbb_string = svn_stringbuf_create ("bbb", pool);
> + ccc_string = svn_stringbuf_create ("ccc", pool);
>
> window.sview_offset = 0;
> window.sview_len = 0;
> @@ -59,7 +59,7 @@
> window.ops[0].action_code = svn_txdelta_new;
> window.ops[0].offset = 0;
> window.ops[0].length = 10;
> - window.new_data = svn_string_create ("test delta", pool);
> + window.new_data = svn_stringbuf_create ("test delta", pool);
>
> svn_delta_get_xml_editor (svn_stream_from_stdio (stdout, pool),
> &editor, &edit_baton, pool);
>
>
>
> 1.82 +3 -3 subversion/subversion/tests/libsvn_fs/fs-test.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/libsvn_fs/fs-test.c.diff?r1=1.81&r2=1.82
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: fs-test.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/libsvn_fs/fs-test.c,v
> retrieving revision 1.81
> retrieving revision 1.82
> diff -u -b -r1.81 -r1.82
> --- fs-test.c 2001/06/11 03:30:09 1.81
> +++ fs-test.c 2001/06/13 09:10:36 1.82
> @@ -414,7 +414,7 @@
> svn_fs_root_t *txn_root;
> svn_stream_t *rstream;
> svn_stringbuf_t *rstring;
> - svn_stringbuf_t *wstring = svn_string_create ("Wicki wild, wicki wicki wild.",
> + svn_stringbuf_t *wstring = svn_stringbuf_create ("Wicki wild, wicki wicki wild.",
> pool);
>
> *msg = "write and read a file's contents";
> @@ -436,7 +436,7 @@
> SVN_ERR (svn_test__stream_to_string (&rstring, rstream, pool));
>
> /* Compare what was read to what was written. */
> - if (! svn_string_compare (rstring, wstring))
> + if (! svn_stringbuf_compare (rstring, wstring))
> return svn_error_create (SVN_ERR_FS_GENERAL, 0, NULL, pool,
> "data read != data written.");
>
> @@ -1783,7 +1783,7 @@
> {
> svn_fs_id_t *iota_id, *beta_id, *C_id, *D_id, *omega_id;
> svn_stringbuf_t *iota_str, *beta_str, *C_str, *D_str, *omega_str;
> - svn_stringbuf_t *not_an_id_str = svn_string_create ("fish", pool);
> + svn_stringbuf_t *not_an_id_str = svn_stringbuf_create ("fish", pool);
> apr_hash_t *entries;
> apr_off_t len;
> void *val;
>
>
>
> 1.23 +14 -14 subversion/subversion/tests/libsvn_fs/skel-test.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/libsvn_fs/skel-test.c.diff?r1=1.22&r2=1.23
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: skel-test.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/libsvn_fs/skel-test.c,v
> retrieving revision 1.22
> retrieving revision 1.23
> diff -u -b -r1.22 -r1.23
> --- skel-test.c 2001/06/08 21:31:23 1.22
> +++ skel-test.c 2001/06/13 09:10:36 1.23
> @@ -46,7 +46,7 @@
> {
> svn_pool_clear (pool);
>
> - return svn_string_ncreate (0, 0, pool);
> + return svn_stringbuf_ncreate (0, 0, pool);
> }
>
> /* Parse a skeleton from a Subversion string. */
> @@ -171,9 +171,9 @@
> && ! skel_is_space (term)
> && ! skel_is_paren (term))
> abort ();
> - svn_string_appendbytes (str, &byte, 1);
> + svn_stringbuf_appendbytes (str, &byte, 1);
> if (term != '\0')
> - svn_string_appendbytes (str, &term, 1);
> + svn_stringbuf_appendbytes (str, &term, 1);
> }
>
>
> @@ -224,9 +224,9 @@
> && ! skel_is_paren (term))
> abort ();
>
> - svn_string_appendbytes (str, name, len);
> + svn_stringbuf_appendbytes (str, name, len);
> if (term != '\0')
> - svn_string_appendbytes (str, &term, 1);
> + svn_stringbuf_appendbytes (str, &term, 1);
> }
>
>
> @@ -262,7 +262,7 @@
> for (i = 0; i < 256; i++)
> if (skel_is_name((apr_byte_t)i))
> {
> - svn_string_setempty (str);
> + svn_stringbuf_setempty (str);
> put_implicit_length_byte (str, (apr_byte_t)i, *c);
> skel = parse_str (str, pool);
> if (! check_implicit_length_byte (skel, (apr_byte_t)i))
> @@ -274,7 +274,7 @@
>
> /* Try an atom that contains every character that's legal in an
> implicit-length atom. */
> - svn_string_setempty (str);
> + svn_stringbuf_setempty (str);
> put_implicit_length_all_chars (str, '\0');
> skel = parse_str (str, pool);
> if (! check_implicit_length_all_chars (skel))
> @@ -306,7 +306,7 @@
> /* Copy in the real data (which may contain nulls). */
> memcpy (buf + length_len, data, len);
>
> - svn_string_appendbytes (str, buf, length_len + len);
> + svn_stringbuf_appendbytes (str, buf, length_len + len);
> }
>
>
> @@ -333,7 +333,7 @@
> for (i = 0; i < 256; i++)
> if (skel_is_space ( (apr_byte_t)i))
> {
> - svn_string_setempty (str);
> + svn_stringbuf_setempty (str);
> put_explicit_length (str, data, len, (apr_byte_t)i);
> skel = parse_str (str, pool);
> if (! check_explicit_length (skel, data, check_len))
> @@ -441,9 +441,9 @@
> if (len > 0 && ! skel_is_space (space))
> abort ();
>
> - svn_string_appendcstr (str, "(");
> + svn_stringbuf_appendcstr (str, "(");
> for (i = 0; i < len; i++)
> - svn_string_appendbytes (str, &space, 1);
> + svn_stringbuf_appendbytes (str, &space, 1);
> }
>
>
> @@ -458,8 +458,8 @@
> abort ();
>
> for (i = 0; i < len; i++)
> - svn_string_appendbytes (str, &space, 1);
> - svn_string_appendcstr (str, ")");
> + svn_stringbuf_appendbytes (str, &space, 1);
> + svn_stringbuf_appendcstr (str, ")");
> }
>
>
> @@ -653,7 +653,7 @@
> /* A list containing an invalid element. */
> str = get_empty_string (pool);
> put_list_start (str, (apr_byte_t)sep, sep_count);
> - svn_string_appendcstr (str, "100 ");
> + svn_stringbuf_appendcstr (str, "100 ");
> put_list_end (str, (apr_byte_t)sep, sep_count);
> if (parse_str (str, pool))
> return fail (pool, "failed to detect invalid element");
>
>
>
> 1.11 +4 -4 subversion/subversion/tests/libsvn_ra_local/ra-local-test.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/libsvn_ra_local/ra-local-test.c.diff?r1=1.10&r2=1.11
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: ra-local-test.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/libsvn_ra_local/ra-local-test.c,v
> retrieving revision 1.10
> retrieving revision 1.11
> diff -u -b -r1.10 -r1.11
> --- ra-local-test.c 2001/06/08 09:01:08 1.10
> +++ ra-local-test.c 2001/06/13 09:10:36 1.11
> @@ -142,7 +142,7 @@
>
> /* Open an ra session into this repository. */
> SVN_ERR (plugin->open (&session,
> - svn_string_create ("file:test-repo-open", pool),
> + svn_stringbuf_create ("file:test-repo-open", pool),
> pool));
>
> /* Close the session. */
> @@ -171,7 +171,7 @@
>
> /* Open an ra session into this repository. */
> SVN_ERR (plugin->open (&session,
> - svn_string_create ("file:test-repo-getrev", pool),
> + svn_stringbuf_create ("file:test-repo-getrev", pool),
> pool));
>
> /* Get the youngest revision and make sure it's 0. */
> @@ -198,7 +198,7 @@
> svn_stringbuf_t *repos_path, *fs_path;
>
> SVN_ERR (svn_ra_local__split_URL (&repos_path, &fs_path,
> - svn_string_create (url, pool),
> + svn_stringbuf_create (url, pool),
> pool));
> return SVN_NO_ERROR;
> }
> @@ -288,7 +288,7 @@
>
> /* Run this URL through our splitter... */
> SVN_ERR (svn_ra_local__split_URL (&repos_part, &fs_part,
> - svn_string_create (url, pool),
> + svn_stringbuf_create (url, pool),
> pool));
> if ((strcmp (repos_part->data, repos_loc))
> || (strcmp (fs_part->data, fs_path)))
>
>
>
> 1.5 +5 -5 subversion/subversion/tests/libsvn_repos/dir-delta-editor.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/libsvn_repos/dir-delta-editor.c.diff?r1=1.4&r2=1.5
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: dir-delta-editor.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/libsvn_repos/dir-delta-editor.c,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -b -r1.4 -r1.5
> --- dir-delta-editor.c 2001/06/11 02:50:33 1.4
> +++ dir-delta-editor.c 2001/06/13 09:10:36 1.5
> @@ -59,7 +59,7 @@
> svn_stringbuf_t *full_path;
>
> /* Construct the full path of this entry based on its parent. */
> - full_path = svn_string_dup (d->path, d->edit_baton->pool);
> + full_path = svn_stringbuf_dup (d->path, d->edit_baton->pool);
> svn_path_add_component (full_path, filename, svn_path_repos_style);
>
> /* Now delete item from the txn. */
> @@ -77,7 +77,7 @@
> struct edit_baton *eb = (struct edit_baton *) edit_baton;
> struct dir_baton *d = apr_pcalloc (eb->pool, sizeof (*d));
>
> - d->path = (svn_stringbuf_t *) svn_string_dup (eb->root_path, eb->pool);
> + d->path = (svn_stringbuf_t *) svn_stringbuf_dup (eb->root_path, eb->pool);
> d->edit_baton = eb;
> *root_baton = d;
>
> @@ -98,7 +98,7 @@
> svn_fs_root_t *rev_root = NULL;
>
> /* Construct the full path of the new directory */
> - d->path = svn_string_dup (pd->path, pd->edit_baton->pool);
> + d->path = svn_stringbuf_dup (pd->path, pd->edit_baton->pool);
> svn_path_add_component (d->path, name, svn_path_local_style);
>
> /* Fill in other baton members */
> @@ -178,7 +178,7 @@
> svn_fs_root_t *rev_root = NULL;
>
> /* Construct the full path of the new directory */
> - fb->path = svn_string_dup (pd->path, pd->edit_baton->pool);
> + fb->path = svn_stringbuf_dup (pd->path, pd->edit_baton->pool);
> svn_path_add_component (fb->path, name, svn_path_local_style);
>
> /* Fill in other baton members */
> @@ -317,7 +317,7 @@
>
> /* Set up the edit baton. */
> my_edit_baton = apr_pcalloc (pool, sizeof (*my_edit_baton));
> - my_edit_baton->root_path = svn_string_dup (path, pool);
> + my_edit_baton->root_path = svn_stringbuf_dup (path, pool);
> my_edit_baton->pool = pool;
> my_edit_baton->fs = fs;
> my_edit_baton->txn_root = txn_root;
>
>
>
> 1.4 +3 -3 subversion/subversion/tests/libsvn_repos/repos-test.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/libsvn_repos/repos-test.c.diff?r1=1.3&r2=1.4
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: repos-test.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/libsvn_repos/repos-test.c,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -b -r1.3 -r1.4
> --- repos-test.c 2001/06/08 21:31:23 1.3
> +++ repos-test.c 2001/06/13 09:10:36 1.4
> @@ -311,16 +311,16 @@
> &edit_baton,
> fs,
> txn_root,
> - svn_string_create ("", subpool),
> + svn_stringbuf_create ("", subpool),
> subpool));
>
> /* Here's the kicker...do the directory delta. */
> SVN_ERR (svn_fs_revision_root (&revision_root, fs, j, subpool));
> SVN_ERR (svn_repos_dir_delta (txn_root,
> - svn_string_create ("", subpool),
> + svn_stringbuf_create ("", subpool),
> rev_diffs,
> revision_root,
> - svn_string_create ("", subpool),
> + svn_stringbuf_create ("", subpool),
> editor,
> edit_baton,
> subpool));
>
>
>
> 1.22 +10 -10 subversion/subversion/tests/libsvn_subr/hashdump-test.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/libsvn_subr/hashdump-test.c.diff?r1=1.21&r2=1.22
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: hashdump-test.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/libsvn_subr/hashdump-test.c,v
> retrieving revision 1.21
> retrieving revision 1.22
> diff -u -b -r1.21 -r1.22
> --- hashdump-test.c 2001/06/08 09:01:08 1.21
> +++ hashdump-test.c 2001/06/13 09:10:36 1.22
> @@ -62,24 +62,24 @@
> /* Build a hash in memory, and fill it with test data. */
> proplist = apr_hash_make (pool);
>
> - key = svn_string_create ("color", pool);
> + key = svn_stringbuf_create ("color", pool);
> apr_hash_set (proplist, key->data, key->len,
> - svn_string_create ("red", pool));
> + svn_stringbuf_create ("red", pool));
>
> - key = svn_string_create ("wine review", pool);
> + key = svn_stringbuf_create ("wine review", pool);
> apr_hash_set (proplist, key->data, key->len,
> - svn_string_create (review, pool));
> + svn_stringbuf_create (review, pool));
>
> - key = svn_string_create ("price", pool);
> + key = svn_stringbuf_create ("price", pool);
> apr_hash_set (proplist, key->data, key->len,
> - svn_string_create ("US $6.50", pool));
> + svn_stringbuf_create ("US $6.50", pool));
>
> /* Test overwriting: same key both times, but different values. */
> - key = svn_string_create ("twice-used property name", pool);
> + key = svn_stringbuf_create ("twice-used property name", pool);
> apr_hash_set (proplist, key->data, key->len,
> - svn_string_create ("This is the FIRST value.", pool));
> + svn_stringbuf_create ("This is the FIRST value.", pool));
> apr_hash_set (proplist, key->data, key->len,
> - svn_string_create ("This is the SECOND value.", pool));
> + svn_stringbuf_create ("This is the SECOND value.", pool));
>
> /* Dump the hash to a file. */
> apr_file_open (&f, "hashdump.out",
> @@ -160,7 +160,7 @@
> found_discrepancy = 1;
>
> /* Do the two strings contain identical data? */
> - else if (! svn_string_compare (orig_str, new_str))
> + else if (! svn_stringbuf_compare (orig_str, new_str))
> found_discrepancy = 1;
> }
>
>
>
>
> 1.4 +2 -2 subversion/subversion/tests/libsvn_subr/path-test.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/libsvn_subr/path-test.c.diff?r1=1.3&r2=1.4
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: path-test.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/libsvn_subr/path-test.c,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -b -r1.3 -r1.4
> --- path-test.c 2001/06/08 21:05:17 1.3
> +++ path-test.c 2001/06/13 09:10:36 1.4
> @@ -46,8 +46,8 @@
> {
> for (j = 0; j < 5; j++)
> {
> - svn_stringbuf_t *path1 = svn_string_create (paths[i], pool);
> - svn_stringbuf_t *path2 = svn_string_create (paths[j], pool);
> + svn_stringbuf_t *path1 = svn_stringbuf_create (paths[i], pool);
> + svn_stringbuf_t *path2 = svn_stringbuf_create (paths[j], pool);
> svn_stringbuf_t *remainder;
>
> remainder = svn_path_is_child (path1, path2,
>
>
>
> 1.10 +31 -31 subversion/subversion/tests/libsvn_subr/stringtest.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/libsvn_subr/stringtest.c.diff?r1=1.9&r2=1.10
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: stringtest.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/libsvn_subr/stringtest.c,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -b -r1.9 -r1.10
> --- stringtest.c 2001/06/08 09:01:08 1.9
> +++ stringtest.c 2001/06/13 09:10:36 1.10
> @@ -54,7 +54,7 @@
> test1 (const char **msg, apr_pool_t *pool)
> {
> *msg = "make svn_stringbuf_t from cstring";
> - a = svn_string_create (phrase_1, pool);
> + a = svn_stringbuf_create (phrase_1, pool);
>
> /* Test that length, data, and null-termination are correct. */
> if ((a->len == strlen (phrase_1)) && ((strcmp (a->data, phrase_1)) == 0))
> @@ -68,7 +68,7 @@
> test2 (const char **msg, apr_pool_t *pool)
> {
> *msg = "make svn_stringbuf_t from substring of cstring";
> - b = svn_string_ncreate (phrase_2, 16, pool);
> + b = svn_stringbuf_ncreate (phrase_2, 16, pool);
>
> /* Test that length, data, and null-termination are correct. */
> if ((b->len == 16) && ((strncmp (b->data, phrase_2, 16)) == 0))
> @@ -86,14 +86,14 @@
>
> *msg = "append svn_stringbuf_t to svn_stringbuf_t";
>
> - a = svn_string_create (phrase_1, pool);
> - b = svn_string_ncreate (phrase_2, 16, pool);
> + a = svn_stringbuf_create (phrase_1, pool);
> + b = svn_stringbuf_ncreate (phrase_2, 16, pool);
>
> tmp = apr_palloc (pool, (a->len + b->len + 1));
> strcpy (tmp, a->data);
> strcat (tmp, b->data);
> old_len = a->len;
> - svn_string_appendstr (a, b);
> + svn_stringbuf_appendstr (a, b);
>
> /* Test that length, data, and null-termination are correct. */
> if ((a->len == (old_len + b->len)) && ((strcmp (a->data, tmp)) == 0))
> @@ -106,14 +106,14 @@
> static svn_error_t *
> test4 (const char **msg, apr_pool_t *pool)
> {
> - a = svn_string_create (phrase_1, pool);
> - svn_string_appendcstr (a, "new bytes to append");
> + a = svn_stringbuf_create (phrase_1, pool);
> + svn_stringbuf_appendcstr (a, "new bytes to append");
>
> *msg = "append C string to svn_stringbuf_t";
>
> /* Test that length, data, and null-termination are correct. */
> - if (svn_string_compare
> - (a, svn_string_create ("hello, new bytes to append", pool)))
> + if (svn_stringbuf_compare
> + (a, svn_stringbuf_create ("hello, new bytes to append", pool)))
> return SVN_NO_ERROR;
> else
> return fail (pool, "test failed");
> @@ -123,14 +123,14 @@
> static svn_error_t *
> test5 (const char **msg, apr_pool_t *pool)
> {
> - a = svn_string_create (phrase_1, pool);
> - svn_string_appendbytes (a, "new bytes to append", 9);
> + a = svn_stringbuf_create (phrase_1, pool);
> + svn_stringbuf_appendbytes (a, "new bytes to append", 9);
>
> *msg = "append bytes, then compare two strings";
>
> /* Test that length, data, and null-termination are correct. */
> - if (svn_string_compare
> - (a, svn_string_create ("hello, new bytes", pool)))
> + if (svn_stringbuf_compare
> + (a, svn_stringbuf_create ("hello, new bytes", pool)))
> return SVN_NO_ERROR;
> else
> return fail (pool, "test failed");
> @@ -140,14 +140,14 @@
> static svn_error_t *
> test6 (const char **msg, apr_pool_t *pool)
> {
> - a = svn_string_create (phrase_1, pool);
> - b = svn_string_create (phrase_2, pool);
> - c = svn_string_dup (a, pool);
> + a = svn_stringbuf_create (phrase_1, pool);
> + b = svn_stringbuf_create (phrase_2, pool);
> + c = svn_stringbuf_dup (a, pool);
>
> *msg = "dup two strings, then compare";
>
> /* Test that length, data, and null-termination are correct. */
> - if ((svn_string_compare (a, c)) && (! svn_string_compare (b, c)))
> + if ((svn_stringbuf_compare (a, c)) && (! svn_stringbuf_compare (b, c)))
> return SVN_NO_ERROR;
> else
> return fail (pool, "test failed");
> @@ -162,13 +162,13 @@
>
> *msg = "chopping a string";
>
> - c = svn_string_create (phrase_2, pool);
> + c = svn_stringbuf_create (phrase_2, pool);
>
> tmp_len = c->len;
> tmp = apr_palloc (pool, c->len + 1);
> strcpy (tmp, c->data);
>
> - svn_string_chop (c, 11);
> + svn_stringbuf_chop (c, 11);
>
> if ((c->len == (tmp_len - 11))
> && (strncmp (tmp, c->data, c->len) == 0)
> @@ -182,11 +182,11 @@
> static svn_error_t *
> test8 (const char **msg, apr_pool_t *pool)
> {
> - c = svn_string_create (phrase_2, pool);
> + c = svn_stringbuf_create (phrase_2, pool);
>
> *msg = "emptying a string";
>
> - svn_string_setempty (c);
> + svn_stringbuf_setempty (c);
>
> if ((c->len == 0) && (c->data[0] == '\0'))
> return SVN_NO_ERROR;
> @@ -198,11 +198,11 @@
> static svn_error_t *
> test9 (const char **msg, apr_pool_t *pool)
> {
> - a = svn_string_create (phrase_1, pool);
> + a = svn_stringbuf_create (phrase_1, pool);
>
> *msg = "fill string with hashmarks";
>
> - svn_string_fillchar (a, '#');
> + svn_stringbuf_fillchar (a, '#');
>
> if ((strcmp (a->data, "#######") == 0)
> && ((strncmp (a->data, "############", a->len - 1)) == 0)
> @@ -229,15 +229,15 @@
>
> *msg = "chop_back_to_char";
>
> - s = svn_string_create ("chop from slash/you'll never see this", pool);
> + s = svn_stringbuf_create ("chop from slash/you'll never see this", pool);
>
> - num_chopped_1 = svn_string_chop_back_to_char (s, '/');
> + num_chopped_1 = svn_stringbuf_chop_back_to_char (s, '/');
> chopped_okay_1 = (! strcmp (s->data, "chop from slash"));
>
> - num_chopped_2 = svn_string_chop_back_to_char (s, 'X');
> + num_chopped_2 = svn_stringbuf_chop_back_to_char (s, 'X');
> chopped_okay_2 = (! strcmp (s->data, "chop from slash"));
>
> - num_chopped_3 = svn_string_chop_back_to_char (s, 'c');
> + num_chopped_3 = svn_stringbuf_chop_back_to_char (s, 'c');
> chopped_okay_3 = (strlen (s->data) == 0);
>
> if (chopped_okay_1
> @@ -263,12 +263,12 @@
>
> *msg = "block initialization and growth";
>
> - s = svn_string_create ("a small string", pool);
> + s = svn_stringbuf_create ("a small string", pool);
> len_1 = (s->len);
> block_len_1 = (s->blocksize);
>
> - t = svn_string_create (", plus a string more than twice as long", pool);
> - svn_string_appendstr (s, t);
> + t = svn_stringbuf_create (", plus a string more than twice as long", pool);
> + svn_stringbuf_appendstr (s, t);
> len_2 = (s->len);
> block_len_2 = (s->blocksize);
>
> @@ -293,7 +293,7 @@
>
> *msg = "formatting strings from varargs";
>
> - s = svn_string_createf (pool,
> + s = svn_stringbuf_createf (pool,
> "This %s is used in test %d.",
> "string",
> 12);
>
>
>
> 1.11 +2 -2 subversion/subversion/tests/libsvn_subr/target-test.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/libsvn_subr/target-test.c.diff?r1=1.10&r2=1.11
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: target-test.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/libsvn_subr/target-test.c,v
> retrieving revision 1.10
> retrieving revision 1.11
> diff -u -b -r1.10 -r1.11
> --- target-test.c 2001/06/11 02:22:08 1.10
> +++ target-test.c 2001/06/13 09:10:36 1.11
> @@ -40,7 +40,7 @@
> targets = apr_array_make(pool, argc - 1, sizeof(svn_stringbuf_t*));
> for (i = 1; i < argc; i++)
> {
> - svn_stringbuf_t * target = svn_string_create(argv[i], pool);
> + svn_stringbuf_t * target = svn_stringbuf_create(argv[i], pool);
> (*((svn_stringbuf_t **)apr_array_push(targets))) = target;
> }
>
> @@ -69,7 +69,7 @@
> if (err != SVN_NO_ERROR)
> svn_handle_error(err, stderr, 1);
>
> - if (!svn_string_compare(common_path, common_path2))
> + if (!svn_stringbuf_compare(common_path, common_path2))
> {
> printf("Common path without getting targets does not match common path "
> "with targets\n");
>
>
>
> 1.45 +4 -4 subversion/subversion/tests/libsvn_wc/checkout-test.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/libsvn_wc/checkout-test.c.diff?r1=1.44&r2=1.45
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: checkout-test.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/libsvn_wc/checkout-test.c,v
> retrieving revision 1.44
> retrieving revision 1.45
> diff -u -b -r1.44 -r1.45
> --- checkout-test.c 2001/06/11 02:22:08 1.44
> +++ checkout-test.c 2001/06/13 09:10:36 1.45
> @@ -46,7 +46,7 @@
> /* Get the editor and friends... */
> err = svn_wc_get_checkout_editor (dest,
> /* Assume we're checking out root. */
> - svn_string_create ("", pool),
> + svn_stringbuf_create ("", pool),
> revision,
> &editor,
> &edit_baton,
> @@ -58,7 +58,7 @@
> return svn_delta_xml_auto_parse (delta,
> editor,
> edit_baton,
> - svn_string_create ("", pool),
> + svn_stringbuf_create ("", pool),
> revision,
> pool);
> }
> @@ -98,12 +98,12 @@
> }
>
> if (argc == 3)
> - target = svn_string_create (argv[2], pool);
> + target = svn_stringbuf_create (argv[2], pool);
>
> err = apply_delta
> (svn_stream_from_aprfile (src, pool),
> target,
> - svn_string_create (":ssh:jrandom@svn.tigris.org/repos", pool),
> + svn_stringbuf_create (":ssh:jrandom@svn.tigris.org/repos", pool),
> 1, /* kff todo: revision must be passed in, right? */
> pool);
>
>
>
>
> 1.33 +2 -2 subversion/subversion/tests/libsvn_wc/commit-test.c
>
> http://subversion.tigris.org/source/browse/subversion/subversion/tests/libsvn_wc/commit-test.c.diff?r1=1.32&r2=1.33
>
> (In the diff below, changes in quantity of whitespace are not shown.)
>
> Index: commit-test.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/libsvn_wc/commit-test.c,v
> retrieving revision 1.32
> retrieving revision 1.33
> diff -u -b -r1.32 -r1.33
> --- commit-test.c 2001/06/08 21:31:23 1.32
> +++ commit-test.c 2001/06/13 09:10:36 1.33
> @@ -76,7 +76,7 @@
> globalpool = svn_pool_create (NULL);
>
> targets = apr_array_make (globalpool, 1, sizeof (svn_stringbuf_t *));
> - rootdir = svn_string_create (argv[1], globalpool);
> + rootdir = svn_stringbuf_create (argv[1], globalpool);
> (*((svn_stringbuf_t**) apr_array_push (targets))) = rootdir;
>
> for (i = 2; i < argc; i++)
> @@ -115,7 +115,7 @@
>
> err = svn_test_get_editor (&my_editor,
> &my_edit_baton,
> - svn_string_create ("COMMIT-TEST",
> + svn_stringbuf_create ("COMMIT-TEST",
> globalpool),
> out_stream,
> 3,
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: cvs-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: cvs-help@subversion.tigris.org