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 2015/08/28 19:01:38 UTC
svn commit: r1698376 - in /subversion/trunk/subversion:
include/private/svn_ra_svn_private.h libsvn_ra_svn/deprecated.c
libsvn_ra_svn/marshal.c
Author: stefan2
Date: Fri Aug 28 17:01:38 2015
New Revision: 1698376
URL: http://svn.apache.org/r1698376
Log:
Introduce an ra-svn private data item type and start migrating all users.
For now, we use a simple typedef to keep both types interchangeable so we
can commit reasonable increments.
This patch introduces the new type, switches the whole private API to it
and add data conversion between private and public API.
* subversion/include/private/svn_ra_svn_private.h
(svn_ra_svn__item_t): Introduce the new private API item type.
(svn_ra_svn__to_public_array,
svn_ra_svn__to_public_item,
svn_ra_svn__to_private_array,
svn_ra_svn__to_private_item): Declare item type conversion functions.
(svn_ra_svn__set_capabilities,
svn_ra_svn__read_item,
svn_ra_svn__parse_proplist): Switch private API to the new private type.
* subversion/libsvn_ra_svn/deprecated.c
(svn_ra_svn_read_item,
svn_ra_svn_parse_tuple,
svn_ra_svn_parse_proplist): Convert between public & private data type.
* subversion/libsvn_ra_svn/marshal.c
(svn_ra_svn__to_public_array,
svn_ra_svn__to_public_item,
svn_ra_svn__to_private_array,
svn_ra_svn__to_private_item): Implement new functions.
(svn_ra_svn_set_capabilities): Convert between public & private data type.
(svn_ra_svn__set_capabilities,
read_string,
read_item,
svn_ra_svn__read_item,
vparse_tuple,
svn_ra_svn__read_tuple,
svn_ra_svn__parse_proplist,
svn_ra_svn__read_string,
svn_ra_svn__read_cstring,
svn_ra_svn__read_word,
svn_ra_svn__read_revision,
svn_ra_svn__read_boolean,
svn_ra_svn__read_list): Replace all item usages with the new type.
Modified:
subversion/trunk/subversion/include/private/svn_ra_svn_private.h
subversion/trunk/subversion/libsvn_ra_svn/deprecated.c
subversion/trunk/subversion/libsvn_ra_svn/marshal.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=1698376&r1=1698375&r2=1698376&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_ra_svn_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_ra_svn_private.h Fri Aug 28 17:01:38 2015
@@ -34,8 +34,36 @@
extern "C" {
#endif /* __cplusplus */
+/** Memory representation of an on-the-wire data item. */
+typedef svn_ra_svn_item_t svn_ra_svn__item_t;
+
+/* Return a deep copy of the SOURCE array containing private API
+ * svn_ra_svn__item_t SOURCE to public API *TARGET, allocating
+ * sub-structures in RESULT_POOL. */
+apr_array_header_t *
+svn_ra_svn__to_public_array(const apr_array_header_t *source,
+ apr_pool_t *result_pool);
+
+/* Deep copy contents from private API *SOURCE to public API *TARGET,
+ * allocating sub-structures in RESULT_POOL. */
+void
+svn_ra_svn__to_public_item(svn_ra_svn_item_t *target,
+ const svn_ra_svn__item_t *source,
+ apr_pool_t *result_pool);
+
+apr_array_header_t *
+svn_ra_svn__to_private_array(const apr_array_header_t *source,
+ apr_pool_t *result_pool);
+
+/* Deep copy contents from public API *SOURCE to private API *TARGET,
+ * allocating sub-structures in RESULT_POOL. */
+void
+svn_ra_svn__to_private_item(svn_ra_svn__item_t *target,
+ const svn_ra_svn_item_t *source,
+ apr_pool_t *result_pool);
+
/** Add the capabilities in @a list to @a conn's capabilities.
- * @a list contains svn_ra_svn_item_t entries (which should be of type
+ * @a list contains svn_ra_svn__item_t entries (which should be of type
* SVN_RA_SVN_WORD; a malformed data error will result if any are not).
*
* This is idempotent: if a given capability was already set for
@@ -186,7 +214,7 @@ svn_ra_svn__write_tuple(svn_ra_svn_conn_
svn_error_t *
svn_ra_svn__read_item(svn_ra_svn_conn_t *conn,
apr_pool_t *pool,
- svn_ra_svn_item_t **item);
+ svn_ra_svn__item_t **item);
/** Scan data on @a conn until we find something which looks like the
* beginning of an svn server greeting (an open paren followed by a
@@ -249,7 +277,7 @@ svn_ra_svn__read_tuple(svn_ra_svn_conn_t
apr_pool_t *pool,
const char *fmt, ...);
-/** Parse an array of @c svn_ra_svn_item_t structures as a list of
+/** Parse an array of @c svn_ra_svn__item_t structures as a list of
* properties, storing the properties in a hash table.
*
* @since New in 1.5.
Modified: subversion/trunk/subversion/libsvn_ra_svn/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/deprecated.c?rev=1698376&r1=1698375&r2=1698376&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/deprecated.c Fri Aug 28 17:01:38 2015
@@ -110,7 +110,12 @@ svn_ra_svn_read_item(svn_ra_svn_conn_t *
apr_pool_t *pool,
svn_ra_svn_item_t **item)
{
- return svn_error_trace(svn_ra_svn__read_item(conn, pool, item));
+ svn_ra_svn__item_t *temp;
+ SVN_ERR(svn_ra_svn__read_item(conn, pool, &temp));
+ *item = apr_pcalloc(pool, sizeof(**item));
+ svn_ra_svn__to_public_item(*item, temp, pool);
+
+ return SVN_NO_ERROR;
}
svn_error_t *
@@ -127,6 +132,7 @@ svn_ra_svn_parse_tuple(const apr_array_h
{
va_list va;
svn_error_t *err;
+ list = svn_ra_svn__to_private_array(list, pool);
va_start(va, fmt);
err = svn_ra_svn__parse_tuple(list, pool, fmt, va);
@@ -155,6 +161,7 @@ svn_ra_svn_parse_proplist(const apr_arra
apr_pool_t *pool,
apr_hash_t **props)
{
+ list = svn_ra_svn__to_private_array(list, pool);
return svn_error_trace(svn_ra_svn__parse_proplist(list, pool, props));
}
Modified: subversion/trunk/subversion/libsvn_ra_svn/marshal.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/marshal.c?rev=1698376&r1=1698375&r2=1698376&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/marshal.c Fri Aug 28 17:01:38 2015
@@ -80,6 +80,96 @@ get_timeout(svn_ra_svn_conn_t *conn)
return conn->block_handler ? 0 : -1;
}
+/* --- Public / private API data conversion --- */
+
+void
+svn_ra_svn__to_public_item(svn_ra_svn_item_t *target,
+ const svn_ra_svn__item_t *source,
+ apr_pool_t *result_pool)
+{
+ target->kind = source->kind;
+ switch (source->kind)
+ {
+ case SVN_RA_SVN_STRING:
+ target->u.string = svn_string_dup(source->u.string, result_pool);
+ break;
+ case SVN_RA_SVN_NUMBER:
+ target->u.number = source->u.number;
+ break;
+ case SVN_RA_SVN_WORD:
+ target->u.word = source->u.word;
+ break;
+ case SVN_RA_SVN_LIST:
+ target->u.list = svn_ra_svn__to_public_array(source->u.list,
+ result_pool);
+ break;
+ }
+}
+
+apr_array_header_t *
+svn_ra_svn__to_public_array(const apr_array_header_t *source,
+ apr_pool_t *result_pool)
+{
+ apr_array_header_t *result = apr_array_make(result_pool, source->nelts,
+ sizeof(svn_ra_svn_item_t));
+
+ int i;
+ for (i = 0; i < source->nelts; ++i)
+ {
+ svn_ra_svn_item_t *sub_target = apr_array_push(result);
+ svn_ra_svn__item_t *sub_source = &APR_ARRAY_IDX(source, i,
+ svn_ra_svn__item_t);
+
+ svn_ra_svn__to_public_item(sub_target, sub_source, result_pool);
+ }
+
+ return result;
+}
+
+void
+svn_ra_svn__to_private_item(svn_ra_svn__item_t *target,
+ const svn_ra_svn_item_t *source,
+ apr_pool_t *result_pool)
+{
+ target->kind = source->kind;
+ switch (source->kind)
+ {
+ case SVN_RA_SVN_STRING:
+ target->u.string = svn_string_dup(source->u.string, result_pool);
+ break;
+ case SVN_RA_SVN_NUMBER:
+ target->u.number = source->u.number;
+ break;
+ case SVN_RA_SVN_WORD:
+ target->u.word = source->u.word;
+ break;
+ case SVN_RA_SVN_LIST:
+ target->u.list = svn_ra_svn__to_private_array(source->u.list,
+ result_pool);
+ break;
+ }
+}
+
+apr_array_header_t *
+svn_ra_svn__to_private_array(const apr_array_header_t *source,
+ apr_pool_t *result_pool)
+{
+ apr_array_header_t *result = apr_array_make(result_pool, source->nelts,
+ sizeof(svn_ra_svn__item_t));
+
+ int i;
+ for (i = 0; i < source->nelts; ++i)
+ {
+ svn_ra_svn__item_t *sub_target = apr_array_push(result);
+ svn_ra_svn_item_t *sub_source = &APR_ARRAY_IDX(source, i,
+ svn_ra_svn_item_t);
+
+ svn_ra_svn__to_private_item(sub_target, sub_source, result_pool);
+ }
+
+ return result;
+}
+
/* --- CONNECTION INITIALIZATION --- */
svn_ra_svn_conn_t *svn_ra_svn_create_conn4(apr_socket_t *sock,
@@ -137,6 +227,7 @@ svn_error_t *
svn_ra_svn_set_capabilities(svn_ra_svn_conn_t *conn,
const apr_array_header_t *list)
{
+ list = svn_ra_svn__to_private_array(list, list->pool);
return svn_error_trace(svn_ra_svn__set_capabilities(conn, list));
}
@@ -145,12 +236,12 @@ svn_ra_svn__set_capabilities(svn_ra_svn_
const apr_array_header_t *list)
{
int i;
- svn_ra_svn_item_t *item;
+ svn_ra_svn__item_t *item;
const char *word;
for (i = 0; i < list->nelts; i++)
{
- item = &APR_ARRAY_IDX(list, i, svn_ra_svn_item_t);
+ item = &APR_ARRAY_IDX(list, i, svn_ra_svn__item_t);
if (item->kind != SVN_RA_SVN_WORD)
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
_("Capability entry is not a word"));
@@ -1035,7 +1126,7 @@ svn_ra_svn__write_tuple(svn_ra_svn_conn_
* Afterwards, *ITEM is of type 'SVN_RA_SVN_STRING', and its string
* data is allocated in POOL. */
static svn_error_t *read_string(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- svn_ra_svn_item_t *item, apr_uint64_t len64)
+ svn_ra_svn__item_t *item, apr_uint64_t len64)
{
apr_size_t len = (apr_size_t)len64;
apr_size_t readbuf_len;
@@ -1103,12 +1194,12 @@ static svn_error_t *read_string(svn_ra_s
* to 0 for the first call and is used to enforce a recursion limit
* on the parser. */
static svn_error_t *read_item(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
- svn_ra_svn_item_t *item, char first_char,
+ svn_ra_svn__item_t *item, char first_char,
int level)
{
char c = first_char;
apr_uint64_t val;
- svn_ra_svn_item_t *listitem;
+ svn_ra_svn__item_t *listitem;
if (++level >= ITEM_NESTING_LIMIT)
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
@@ -1200,7 +1291,7 @@ static svn_error_t *read_item(svn_ra_svn
{
/* Read in the list items. */
item->kind = SVN_RA_SVN_LIST;
- item->u.list = apr_array_make(pool, 4, sizeof(svn_ra_svn_item_t));
+ item->u.list = apr_array_make(pool, 4, sizeof(svn_ra_svn__item_t));
while (1)
{
SVN_ERR(readbuf_getchar_skip_whitespace(conn, pool, &c));
@@ -1310,7 +1401,7 @@ read_command_only(svn_ra_svn_conn_t *con
svn_error_t *
svn_ra_svn__read_item(svn_ra_svn_conn_t *conn,
apr_pool_t *pool,
- svn_ra_svn_item_t **item)
+ svn_ra_svn__item_t **item)
{
char c;
@@ -1360,20 +1451,20 @@ svn_ra_svn__skip_leading_garbage(svn_ra_
/* --- READING AND PARSING TUPLES --- */
-/* Parse a tuple of svn_ra_svn_item_t *'s. Advance *FMT to the end of the
+/* Parse a tuple of svn_ra_svn__item_t *'s. Advance *FMT to the end of the
* tuple specification and advance AP by the corresponding arguments. */
static svn_error_t *vparse_tuple(const apr_array_header_t *items, apr_pool_t *pool,
const char **fmt, va_list *ap)
{
int count, nesting_level;
- svn_ra_svn_item_t *elt;
+ svn_ra_svn__item_t *elt;
for (count = 0; **fmt && count < items->nelts; (*fmt)++, count++)
{
/* '?' just means the tuple may stop; skip past it. */
if (**fmt == '?')
(*fmt)++;
- elt = &APR_ARRAY_IDX(items, count, svn_ra_svn_item_t);
+ elt = &APR_ARRAY_IDX(items, count, svn_ra_svn__item_t);
if (**fmt == '(' && elt->kind == SVN_RA_SVN_LIST)
{
(*fmt)++;
@@ -1490,7 +1581,7 @@ svn_ra_svn__read_tuple(svn_ra_svn_conn_t
const char *fmt, ...)
{
va_list ap;
- svn_ra_svn_item_t *item;
+ svn_ra_svn__item_t *item;
svn_error_t *err;
SVN_ERR(svn_ra_svn__read_item(conn, pool, &item));
@@ -1523,13 +1614,13 @@ svn_ra_svn__parse_proplist(const apr_arr
{
svn_string_t *name;
svn_string_t *value;
- svn_ra_svn_item_t *elt;
+ svn_ra_svn__item_t *elt;
int i;
*props = svn_hash__make(pool);
for (i = 0; i < list->nelts; i++)
{
- elt = &APR_ARRAY_IDX(list, i, svn_ra_svn_item_t);
+ elt = &APR_ARRAY_IDX(list, i, svn_ra_svn__item_t);
if (elt->kind != SVN_RA_SVN_LIST)
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
_("Proplist element not a list"));
@@ -1564,7 +1655,7 @@ svn_error_t *svn_ra_svn__handle_failure_
{
const char *message, *file;
svn_error_t *err = NULL;
- svn_ra_svn_item_t *elt;
+ svn_ra_svn__item_t *elt;
int i;
apr_uint64_t apr_err, line;
apr_pool_t *subpool = svn_pool_create(pool);
@@ -1577,7 +1668,7 @@ svn_error_t *svn_ra_svn__handle_failure_
for (i = params->nelts - 1; i >= 0; i--)
{
svn_pool_clear(subpool);
- elt = &APR_ARRAY_IDX(params, i, svn_ra_svn_item_t);
+ elt = &APR_ARRAY_IDX(params, i, svn_ra_svn__item_t);
if (elt->kind != SVN_RA_SVN_LIST)
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
_("Malformed error list"));
@@ -2678,7 +2769,7 @@ svn_ra_svn__read_string(const apr_array_
int idx,
svn_string_t **result)
{
- svn_ra_svn_item_t *elt = &APR_ARRAY_IDX(items, idx, svn_ra_svn_item_t);
+ svn_ra_svn__item_t *elt = &APR_ARRAY_IDX(items, idx, svn_ra_svn__item_t);
CHECK_PROTOCOL_COND(elt->kind == SVN_RA_SVN_STRING);
*result = elt->u.string;
@@ -2692,7 +2783,7 @@ svn_ra_svn__read_cstring(const apr_array
int idx,
const char **result)
{
- svn_ra_svn_item_t *elt = &APR_ARRAY_IDX(items, idx, svn_ra_svn_item_t);
+ svn_ra_svn__item_t *elt = &APR_ARRAY_IDX(items, idx, svn_ra_svn__item_t);
CHECK_PROTOCOL_COND(elt->kind == SVN_RA_SVN_STRING);
*result = elt->u.string->data;
@@ -2706,7 +2797,7 @@ svn_ra_svn__read_word(const apr_array_he
int idx,
const char **result)
{
- svn_ra_svn_item_t *elt = &APR_ARRAY_IDX(items, idx, svn_ra_svn_item_t);
+ svn_ra_svn__item_t *elt = &APR_ARRAY_IDX(items, idx, svn_ra_svn__item_t);
CHECK_PROTOCOL_COND(elt->kind == SVN_RA_SVN_WORD);
*result = elt->u.word;
@@ -2720,7 +2811,7 @@ svn_ra_svn__read_revision(const apr_arra
int idx,
svn_revnum_t *result)
{
- svn_ra_svn_item_t *elt = &APR_ARRAY_IDX(items, idx, svn_ra_svn_item_t);
+ svn_ra_svn__item_t *elt = &APR_ARRAY_IDX(items, idx, svn_ra_svn__item_t);
CHECK_PROTOCOL_COND(elt->kind == SVN_RA_SVN_NUMBER);
*result = (svn_revnum_t)elt->u.number;
@@ -2734,7 +2825,7 @@ svn_ra_svn__read_boolean(const apr_array
int idx,
apr_uint64_t *result)
{
- svn_ra_svn_item_t *elt = &APR_ARRAY_IDX(items, idx, svn_ra_svn_item_t);
+ svn_ra_svn__item_t *elt = &APR_ARRAY_IDX(items, idx, svn_ra_svn__item_t);
CHECK_PROTOCOL_COND(elt->kind == SVN_RA_SVN_WORD);
if (elt->u.word[0] == 't' && strcmp(elt->u.word, "true") == 0)
*result = TRUE;
@@ -2753,7 +2844,7 @@ svn_ra_svn__read_list(const apr_array_he
int idx,
const apr_array_header_t **result)
{
- svn_ra_svn_item_t *elt = &APR_ARRAY_IDX(items, idx, svn_ra_svn_item_t);
+ svn_ra_svn__item_t *elt = &APR_ARRAY_IDX(items, idx, svn_ra_svn__item_t);
CHECK_PROTOCOL_COND(elt->kind == SVN_RA_SVN_LIST);
*result = elt->u.list;