You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/02/22 16:39:23 UTC
svn commit: r1731664 - in /subversion/trunk/subversion:
include/private/svn_ra_svn_private.h libsvn_ra_svn/marshal.c svnserve/serve.c
Author: stefan2
Date: Mon Feb 22 15:39:22 2016
New Revision: 1731664
URL: http://svn.apache.org/viewvc?rev=1731664&view=rev
Log:
More ra-svn finetuning.
* subversion/include/private/svn_ra_svn_private.h
(svn_ra_svn__write_data_log_changed_path): We now know the path length
in advance.
* subversion/libsvn_ra_svn/marshal.c
(svn_ra_svn__write_data_log_changed_path): Update implementation.
* subversion/svnserve/serve.c
(path_change_receiver): Update caller.
Modified:
subversion/trunk/subversion/include/private/svn_ra_svn_private.h
subversion/trunk/subversion/libsvn_ra_svn/marshal.c
subversion/trunk/subversion/svnserve/serve.c
Modified: subversion/trunk/subversion/include/private/svn_ra_svn_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_ra_svn_private.h?rev=1731664&r1=1731663&r2=1731664&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_ra_svn_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_ra_svn_private.h Mon Feb 22 15:39:22 2016
@@ -978,7 +978,7 @@ svn_ra_svn__write_cmd_finish_replay(svn_
svn_error_t *
svn_ra_svn__write_data_log_changed_path(svn_ra_svn_conn_t *conn,
apr_pool_t *pool,
- const char *path,
+ const svn_string_t *path,
char action,
const char *copyfrom_path,
svn_revnum_t copyfrom_rev,
Modified: subversion/trunk/subversion/libsvn_ra_svn/marshal.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/marshal.c?rev=1731664&r1=1731663&r2=1731664&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/marshal.c Mon Feb 22 15:39:22 2016
@@ -2804,7 +2804,7 @@ changed_path_flags(svn_node_kind_t node_
svn_error_t *
svn_ra_svn__write_data_log_changed_path(svn_ra_svn_conn_t *conn,
apr_pool_t *pool,
- const char *path,
+ const svn_string_t *path,
char action,
const char *copyfrom_path,
svn_revnum_t copyfrom_rev,
@@ -2812,7 +2812,7 @@ svn_ra_svn__write_data_log_changed_path(
svn_boolean_t text_modified,
svn_boolean_t props_modified)
{
- apr_size_t path_len = strlen(path);
+ apr_size_t path_len = path->len;
apr_size_t copyfrom_len = copyfrom_path ? strlen(copyfrom_path) : 0;
const svn_string_t *flags_str = changed_path_flags(node_kind,
text_modified,
@@ -2845,7 +2845,7 @@ svn_ra_svn__write_data_log_changed_path(
p[1] = ' ';
/* Write path. */
- p = write_ncstring_quick(p + 2, path, path_len);
+ p = write_ncstring_quick(p + 2, path->data, path_len);
/* Action */
p[0] = action;
@@ -2873,7 +2873,7 @@ svn_ra_svn__write_data_log_changed_path(
/* Standard code path (fallback). */
SVN_ERR(write_tuple_start_list(conn, pool));
- SVN_ERR(svn_ra_svn__write_ncstring(conn, pool, path, path_len));
+ SVN_ERR(svn_ra_svn__write_ncstring(conn, pool, path->data, path_len));
SVN_ERR(writebuf_writechar(conn, pool, action));
SVN_ERR(writebuf_writechar(conn, pool, ' '));
SVN_ERR(write_tuple_start_list(conn, pool));
Modified: subversion/trunk/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1731664&r1=1731663&r2=1731664&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Mon Feb 22 15:39:22 2016
@@ -2222,7 +2222,7 @@ path_change_receiver(void *baton,
/* Serialize CHANGE. */
SVN_ERR(svn_ra_svn__write_data_log_changed_path(
conn, scratch_pool,
- change->path.data,
+ &change->path,
action,
change->copyfrom_path,
change->copyfrom_rev,