You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/01/03 17:11:00 UTC
svn commit: r1555133 - in /subversion/trunk: ./ subversion/include/
subversion/include/private/ subversion/libsvn_client/
subversion/libsvn_delta/ subversion/libsvn_fs_fs/ subversion/libsvn_fs_x/
subversion/libsvn_ra/ subversion/libsvn_ra_serf/ subvers...
Author: rhuijben
Date: Fri Jan 3 16:10:59 2014
New Revision: 1555133
URL: http://svn.apache.org/r1555133
Log:
Get rid of the ever increasing number of private apis in svn_sorts.h by adding
a new private/svn_sorts_private.h file with the private parts and updating the
needed #include-s.
For 1.9 the number of private apis in this public header more than doubled,
doubling the original filesize, while our policy is to never add private
functions in public headers.
* build.conf
(libsvn_subr): Add export.
* subversion/include/private/svn_sorts_private.h
New file, copied from ../svn_sorts.h.
* subversion/include/svn_sorts.h
Remove everything possible in our private namespace. Keeping some
references.
* subversion/libsvn_client/diff_local.c
* subversion/libsvn_client/import.c
* subversion/libsvn_client/info.c
* subversion/libsvn_client/list.c
* subversion/libsvn_client/merge.c
* subversion/libsvn_client/mergeinfo.c
* subversion/libsvn_client/status.c
* subversion/libsvn_delta/compat.c
* subversion/libsvn_fs_fs/cached_data.c
* subversion/libsvn_fs_fs/index.c
* subversion/libsvn_fs_fs/low_level.c
* subversion/libsvn_fs_fs/pack.c
* subversion/libsvn_fs_fs/temp_serializer.c
* subversion/libsvn_fs_fs/transaction.c
* subversion/libsvn_fs_x/index.c
* subversion/libsvn_fs_x/low_level.c
* subversion/libsvn_fs_x/pack.c
* subversion/libsvn_fs_x/transaction.c
* subversion/libsvn_ra/compat.c
* subversion/libsvn_ra_serf/inherited_props.c
* subversion/libsvn_ra_serf/lock.c
* subversion/libsvn_ra_serf/util.c
* subversion/libsvn_repos/dump.c
* subversion/libsvn_repos/fs-wrap.c
* subversion/libsvn_subr/cmdline.c
* subversion/libsvn_subr/hash.c
* subversion/libsvn_subr/mergeinfo.c
* subversion/libsvn_subr/sorts.c
* subversion/libsvn_wc/adm_ops.c
* subversion/libsvn_wc/diff_editor.c
* subversion/libsvn_wc/status.c
* subversion/libsvn_wc/wc_db.c
* subversion/libsvn_wc/wc_db_update_move.c
* subversion/mod_dav_svn/repos.c
* subversion/svn/log-cmd.c
* subversion/svn/propget-cmd.c
* subversion/svnadmin/svnadmin.c
* subversion/svnlook/svnlook.c
* subversion/tests/libsvn_subr/priority-queue-test.c
* subversion/tests/libsvn_wc/op-depth-test.c
Fix includes.
Added:
subversion/trunk/subversion/include/private/svn_sorts_private.h
- copied, changed from r1555122, subversion/trunk/subversion/include/svn_sorts.h
Modified:
subversion/trunk/build.conf
subversion/trunk/subversion/include/svn_sorts.h
subversion/trunk/subversion/libsvn_client/diff_local.c
subversion/trunk/subversion/libsvn_client/import.c
subversion/trunk/subversion/libsvn_client/info.c
subversion/trunk/subversion/libsvn_client/list.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/mergeinfo.c
subversion/trunk/subversion/libsvn_client/status.c
subversion/trunk/subversion/libsvn_delta/compat.c
subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
subversion/trunk/subversion/libsvn_fs_fs/index.c
subversion/trunk/subversion/libsvn_fs_fs/low_level.c
subversion/trunk/subversion/libsvn_fs_fs/pack.c
subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
subversion/trunk/subversion/libsvn_fs_fs/transaction.c
subversion/trunk/subversion/libsvn_fs_x/index.c
subversion/trunk/subversion/libsvn_fs_x/low_level.c
subversion/trunk/subversion/libsvn_fs_x/pack.c
subversion/trunk/subversion/libsvn_fs_x/transaction.c
subversion/trunk/subversion/libsvn_ra/compat.c
subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c
subversion/trunk/subversion/libsvn_ra_serf/lock.c
subversion/trunk/subversion/libsvn_ra_serf/util.c
subversion/trunk/subversion/libsvn_repos/dump.c
subversion/trunk/subversion/libsvn_repos/fs-wrap.c
subversion/trunk/subversion/libsvn_subr/cmdline.c
subversion/trunk/subversion/libsvn_subr/hash.c
subversion/trunk/subversion/libsvn_subr/mergeinfo.c
subversion/trunk/subversion/libsvn_subr/sorts.c
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/diff_editor.c
subversion/trunk/subversion/libsvn_wc/status.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
subversion/trunk/subversion/mod_dav_svn/repos.c
subversion/trunk/subversion/svn/log-cmd.c
subversion/trunk/subversion/svn/propget-cmd.c
subversion/trunk/subversion/svnadmin/svnadmin.c
subversion/trunk/subversion/svnlook/svnlook.c
subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c
subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Fri Jan 3 16:10:59 2014
@@ -379,6 +379,7 @@ msvc-export =
private\svn_utf_private.h private\svn_eol_private.h
private\svn_token.h private\svn_adler32.h
private\svn_temp_serializer.h private\svn_io_private.h
+ private\svn_sorts_private.h
private\svn_string_private.h private\svn_magic.h
private\svn_subr_private.h private\svn_mutex.h private\svn_named_atomic.h
private\svn_packed_data.h private\svn_object_pool.h
Copied: subversion/trunk/subversion/include/private/svn_sorts_private.h (from r1555122, subversion/trunk/subversion/include/svn_sorts.h)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_sorts_private.h?p2=subversion/trunk/subversion/include/private/svn_sorts_private.h&p1=subversion/trunk/subversion/include/svn_sorts.h&r1=1555122&r2=1555133&rev=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_sorts.h (original)
+++ subversion/trunk/subversion/include/private/svn_sorts_private.h Fri Jan 3 16:10:59 2014
@@ -25,23 +25,10 @@
*/
-#ifndef SVN_SORTS_H
-#define SVN_SORTS_H
+#ifndef SVN_SORTS_PRIVATE_H
+#define SVN_SORTS_PRIVATE_H
-#include <apr.h> /* for apr_ssize_t */
-#include <apr_pools.h> /* for apr_pool_t */
-#include <apr_tables.h> /* for apr_array_header_t */
-#include <apr_hash.h> /* for apr_hash_t */
-
-/* Define a MAX macro if we don't already have one */
-#ifndef MAX
-#define MAX(a, b) ((a) < (b) ? (b) : (a))
-#endif
-
-/* Define a MIN macro if we don't already have one */
-#ifndef MIN
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
+#include "../svn_sorts.h"
#ifdef __cplusplus
extern "C" {
@@ -52,7 +39,7 @@ extern "C" {
/** This structure is used to hold a key/value from a hash table.
* @note Private. For use by Subversion's own code only. See issue #1644.
*/
-typedef struct svn_sort__item_t {
+struct svn_sort__item_t {
/** pointer to the key */
const void *key;
@@ -61,93 +48,7 @@ typedef struct svn_sort__item_t {
/** pointer to the value */
void *value;
-} svn_sort__item_t;
-
-
-/** Compare two @c svn_sort__item_t's, returning an integer greater than,
- * equal to, or less than 0, according to whether the key of @a a is
- * greater than, equal to, or less than the key of @a b as determined
- * by comparing them with svn_path_compare_paths().
- *
- * The key strings must be NULL-terminated, even though klen does not
- * include the terminator.
- *
- * This is useful for converting a hash into a sorted
- * @c apr_array_header_t. For example, to convert hash @a hsh to a sorted
- * array, do this:
- *
- * @code
- apr_array_header_t *array;
- array = svn_sort__hash(hsh, svn_sort_compare_items_as_paths, pool);
- @endcode
- *
- * This function works like svn_sort_compare_items_lexically() except that it
- * orders children in subdirectories directly after their parents. This allows
- * using the given ordering for a depth first walk, but at a performance
- * penalty. Code that doesn't need this special behavior for children, e.g. when
- * sorting files at a single directory level should use
- * svn_sort_compare_items_lexically() instead.
- */
-int
-svn_sort_compare_items_as_paths(const svn_sort__item_t *a,
- const svn_sort__item_t *b);
-
-
-/** Compare two @c svn_sort__item_t's, returning an integer greater than,
- * equal to, or less than 0, according as @a a is greater than, equal to,
- * or less than @a b according to a lexical key comparison. The keys are
- * not required to be zero-terminated.
- */
-int
-svn_sort_compare_items_lexically(const svn_sort__item_t *a,
- const svn_sort__item_t *b);
-
-/** Compare two @c svn_revnum_t's, returning an integer greater than, equal
- * to, or less than 0, according as @a b is greater than, equal to, or less
- * than @a a. Note that this sorts newest revision to oldest (IOW, descending
- * order).
- *
- * This function is compatible for use with qsort().
- *
- * This is useful for converting an array of revisions into a sorted
- * @c apr_array_header_t. You are responsible for detecting, preventing or
- * removing duplicates.
- */
-int
-svn_sort_compare_revisions(const void *a,
- const void *b);
-
-
-/**
- * Compare two @c const char * paths, @a *a and @a *b, returning an
- * integer greater than, equal to, or less than 0, using the same
- * comparison rules as are used by svn_path_compare_paths().
- *
- * This function is compatible for use with qsort().
- *
- * @since New in 1.1.
- */
-int
-svn_sort_compare_paths(const void *a,
- const void *b);
-
-/**
- * Compare two @c svn_merge_range_t *'s, @a *a and @a *b, returning an
- * integer greater than, equal to, or less than 0 if the first range is
- * greater than, equal to, or less than, the second range.
- *
- * Both @c svn_merge_range_t *'s must describe forward merge ranges.
- *
- * If @a *a and @a *b intersect then the range with the lower start revision
- * is considered the lesser range. If the ranges' start revisions are
- * equal then the range with the lower end revision is considered the
- * lesser range.
- *
- * @since New in 1.5
- */
-int
-svn_sort_compare_ranges(const void *a,
- const void *b);
+};
/** Sort @a ht according to its keys, return an @c apr_array_header_t
* containing @c svn_sort__item_t structures holding those keys and values
@@ -315,4 +216,4 @@ svn_priority_queue__push(svn_priority_qu
}
#endif /* __cplusplus */
-#endif /* SVN_SORTS_H */
+#endif /* SVN_SORTS_PRIVATE_H */
Modified: subversion/trunk/subversion/include/svn_sorts.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_sorts.h?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_sorts.h (original)
+++ subversion/trunk/subversion/include/svn_sorts.h Fri Jan 3 16:10:59 2014
@@ -52,16 +52,7 @@ extern "C" {
/** This structure is used to hold a key/value from a hash table.
* @note Private. For use by Subversion's own code only. See issue #1644.
*/
-typedef struct svn_sort__item_t {
- /** pointer to the key */
- const void *key;
-
- /** size of the key */
- apr_ssize_t klen;
-
- /** pointer to the value */
- void *value;
-} svn_sort__item_t;
+typedef struct svn_sort__item_t svn_sort__item_t;
/** Compare two @c svn_sort__item_t's, returning an integer greater than,
@@ -149,168 +140,6 @@ int
svn_sort_compare_ranges(const void *a,
const void *b);
-/** Sort @a ht according to its keys, return an @c apr_array_header_t
- * containing @c svn_sort__item_t structures holding those keys and values
- * (i.e. for each @c svn_sort__item_t @a item in the returned array,
- * @a item->key and @a item->size are the hash key, and @a item->value points to
- * the hash value).
- *
- * Storage is shared with the original hash, not copied.
- *
- * @a comparison_func should take two @c svn_sort__item_t's and return an
- * integer greater than, equal to, or less than 0, according as the first item
- * is greater than, equal to, or less than the second.
- *
- * @note Private. For use by Subversion's own code only. See issue #1644.
- *
- * @note This function and the @c svn_sort__item_t should go over to APR.
- */
-apr_array_header_t *
-svn_sort__hash(apr_hash_t *ht,
- int (*comparison_func)(const svn_sort__item_t *,
- const svn_sort__item_t *),
- apr_pool_t *pool);
-
-/* Return the lowest index at which the element @a *key should be inserted into
- * the array @a array, according to the ordering defined by @a compare_func.
- * The array must already be sorted in the ordering defined by @a compare_func.
- * @a compare_func is defined as for the C stdlib function bsearch(); the
- * @a key will always passed to it as the second parameter.
- *
- * @note Private. For use by Subversion's own code only.
- */
-int
-svn_sort__bsearch_lower_bound(const apr_array_header_t *array,
- const void *key,
- int (*compare_func)(const void *, const void *));
-
-/* Find the lowest index at which the element @a *key should be inserted into
- * the array @a array, according to the ordering defined by @a compare_func.
- * The array must already be sorted in the ordering defined by @a compare_func.
- * @a compare_func is defined as for the C stdlib function bsearch(); the
- * @a key will always passed to it as the second parameter.
- *
- * Returns a reference to the array element at the insertion location if
- * that matches @a key and return NULL otherwise. If you call this function
- * multiple times for the same array and expect the results to often be
- * consecutive array elements, provide @a hint. It should be initialized
- * with -1 for the first call and receives the array index if the returned
- * element. If the return value is NULL, @a *hint is the location where
- * the respective key would be inserted.
- *
- * @note Private. For use by Subversion's own code only.
- */
-void *
-svn_sort__array_lookup(const apr_array_header_t *array,
- const void *key,
- int *hint,
- int (*compare_func)(const void *, const void *));
-
-
-/* Insert a shallow copy of @a *new_element into the array @a array at the index
- * @a insert_index, growing the array and shuffling existing elements along to
- * make room.
- *
- * @note Private. For use by Subversion's own code only.
- */
-void
-svn_sort__array_insert(apr_array_header_t *array,
- const void *new_element,
- int insert_index);
-
-
-/* Remove @a elements_to_delete elements starting at @a delete_index from the
- * array @a arr. If @a delete_index is not a valid element of @a arr,
- * @a elements_to_delete is not greater than zero, or
- * @a delete_index + @a elements_to_delete is greater than @a arr->nelts,
- * then do nothing.
- *
- * @note Private. For use by Subversion's own code only.
- */
-void
-svn_sort__array_delete(apr_array_header_t *arr,
- int delete_index,
- int elements_to_delete);
-
-/* Reverse the order of elements in @a array, in place.
- *
- * @note Private. For use by Subversion's own code only.
- */
-void
-svn_sort__array_reverse(apr_array_header_t *array,
- apr_pool_t *scratch_pool);
-
-/** Priority queues.
- *
- * @defgroup svn_priority_queue__t Priority Queues
- * @{
- */
-
-/**
- * We implement priority queues on top of existing ELEMENTS arrays. They
- * provide us with memory management and very basic element type information.
- *
- * The extraction order is being defined by a comparison function similar
- * to the ones used with qsort. The first element in the queue is always
- * on with COMPARISON_FUNC(first,element) <= 0, for all elements in the
- * queue.
- */
-
-/**
- * Opaque data type for priority queues.
- */
-typedef struct svn_priority_queue__t svn_priority_queue__t;
-
-/**
- * Return a priority queue containing all provided @a elements and prioritize
- * them according to @a compare_func.
- *
- * @note The priority queue will use the existing @a elements array for data
- * storage. So, you must not manipulate that array while using the queue.
- * Also, the lifetime of the queue is bound to that of the array.
- */
-svn_priority_queue__t *
-svn_priority_queue__create(apr_array_header_t *elements,
- int (*compare_func)(const void *, const void *));
-
-/**
- * Returns the number of elements in the @a queue.
- */
-apr_size_t
-svn_priority_queue__size(svn_priority_queue__t *queue);
-
-/**
- * Returns a reference to the first element in the @a queue. The queue
- * contents remains unchanged. If the @a queue is empty, #NULL will be
- * returned.
- */
-void *
-svn_priority_queue__peek(svn_priority_queue__t *queue);
-
-/**
- * Notify the @a queue after modifying the first item as returned by
- * #svn_priority_queue__peek.
- */
-void
-svn_priority_queue__update(svn_priority_queue__t *queue);
-
-/**
- * Remove the first element from the @a queue. This is a no-op for empty
- * queues.
- */
-void
-svn_priority_queue__pop(svn_priority_queue__t *queue);
-
-/**
- * Append the new @a element to the @a queue. @a element must neither be
- * #NULL nor the first element as returned by #svn_priority_queue__peek.
- */
-void
-svn_priority_queue__push(svn_priority_queue__t *queue, const void *element);
-
-/** @} */
-
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/trunk/subversion/libsvn_client/diff_local.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff_local.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff_local.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff_local.c Fri Jan 3 16:10:59 2014
@@ -47,6 +47,7 @@
#include "svn_subst.h"
#include "client.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_wc_private.h"
Modified: subversion/trunk/subversion/libsvn_client/import.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/import.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/import.c (original)
+++ subversion/trunk/subversion/libsvn_client/import.c Fri Jan 3 16:10:59 2014
@@ -48,8 +48,9 @@
#include "svn_props.h"
#include "client.h"
-#include "private/svn_subr_private.h"
#include "private/svn_ra_private.h"
+#include "private/svn_sorts_private.h"
+#include "private/svn_subr_private.h"
#include "private/svn_magic.h"
/* Import context baton.
Modified: subversion/trunk/subversion/libsvn_client/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/info.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/info.c (original)
+++ subversion/trunk/subversion/libsvn_client/info.c Fri Jan 3 16:10:59 2014
@@ -34,6 +34,7 @@
#include "svn_wc.h"
#include "private/svn_fspath.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_wc_private.h"
Modified: subversion/trunk/subversion/libsvn_client/list.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/list.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/list.c (original)
+++ subversion/trunk/subversion/libsvn_client/list.c Fri Jan 3 16:10:59 2014
@@ -35,6 +35,7 @@
#include "private/svn_fspath.h"
#include "private/svn_ra_private.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_wc_private.h"
/* Prototypes for referencing before declaration */
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Jan 3 16:10:59 2014
@@ -56,13 +56,12 @@
#include "client.h"
#include "mergeinfo.h"
-#include "private/svn_opt_private.h"
-#include "private/svn_wc_private.h"
-#include "private/svn_mergeinfo_private.h"
#include "private/svn_fspath.h"
-#include "private/svn_ra_private.h"
+#include "private/svn_mergeinfo_private.h"
#include "private/svn_client_private.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_subr_private.h"
+#include "private/svn_wc_private.h"
/*-----------------------------------------------------------------------*/
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Fri Jan 3 16:10:59 2014
@@ -39,12 +39,13 @@
#include "svn_client.h"
#include "svn_hash.h"
+#include "private/svn_client_private.h"
#include "private/svn_opt_private.h"
#include "private/svn_mergeinfo_private.h"
-#include "private/svn_wc_private.h"
#include "private/svn_ra_private.h"
+#include "private/svn_sorts_private.h"
+#include "private/svn_wc_private.h"
#include "private/svn_fspath.h"
-#include "private/svn_client_private.h"
#include "client.h"
#include "mergeinfo.h"
Modified: subversion/trunk/subversion/libsvn_client/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/status.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/status.c (original)
+++ subversion/trunk/subversion/libsvn_client/status.c Fri Jan 3 16:10:59 2014
@@ -41,8 +41,9 @@
#include "svn_error.h"
#include "svn_hash.h"
-#include "private/svn_wc_private.h"
#include "private/svn_client_private.h"
+#include "private/svn_sorts_private.h"
+#include "private/svn_wc_private.h"
/*** Getting update information ***/
Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Fri Jan 3 16:10:59 2014
@@ -34,6 +34,7 @@
#include "svn_pools.h"
#include "private/svn_delta_private.h"
+#include "private/svn_sorts_private.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/cached_data.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/cached_data.c Fri Jan 3 16:10:59 2014
@@ -28,6 +28,7 @@
#include "svn_ctype.h"
#include "svn_sorts.h"
#include "private/svn_io_private.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_subr_private.h"
#include "private/svn_temp_serializer.h"
Modified: subversion/trunk/subversion/libsvn_fs_fs/index.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/index.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/index.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/index.c Fri Jan 3 16:10:59 2014
@@ -28,6 +28,7 @@
#include "svn_private_config.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_subr_private.h"
#include "private/svn_temp_serializer.h"
Modified: subversion/trunk/subversion/libsvn_fs_fs/low_level.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/low_level.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/low_level.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/low_level.c Fri Jan 3 16:10:59 2014
@@ -24,6 +24,7 @@
#include "svn_hash.h"
#include "svn_pools.h"
#include "svn_sorts.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_string_private.h"
#include "private/svn_subr_private.h"
Modified: subversion/trunk/subversion/libsvn_fs_fs/pack.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/pack.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/pack.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/pack.c Fri Jan 3 16:10:59 2014
@@ -26,6 +26,7 @@
#include "svn_dirent_uri.h"
#include "svn_sorts.h"
#include "private/svn_temp_serializer.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_subr_private.h"
#include "private/svn_string_private.h"
#include "private/svn_io_private.h"
Modified: subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c Fri Jan 3 16:10:59 2014
@@ -29,6 +29,7 @@
#include "svn_fs.h"
#include "private/svn_fs_util.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_temp_serializer.h"
#include "private/svn_subr_private.h"
Modified: subversion/trunk/subversion/libsvn_fs_fs/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/transaction.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/transaction.c Fri Jan 3 16:10:59 2014
@@ -43,6 +43,7 @@
#include "rep-cache.h"
#include "private/svn_fs_util.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_subr_private.h"
#include "private/svn_string_private.h"
#include "../libsvn_fs/fs-loader.h"
Modified: subversion/trunk/subversion/libsvn_fs_x/index.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/index.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/index.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/index.c Fri Jan 3 16:10:59 2014
@@ -31,6 +31,7 @@
#include "pack.h"
#include "private/svn_dep_compat.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_subr_private.h"
#include "private/svn_temp_serializer.h"
Modified: subversion/trunk/subversion/libsvn_fs_x/low_level.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/low_level.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/low_level.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/low_level.c Fri Jan 3 16:10:59 2014
@@ -24,6 +24,7 @@
#include "svn_hash.h"
#include "svn_pools.h"
#include "svn_sorts.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_string_private.h"
#include "../libsvn_fs/fs-loader.h"
Modified: subversion/trunk/subversion/libsvn_fs_x/pack.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/pack.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/pack.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/pack.c Fri Jan 3 16:10:59 2014
@@ -24,9 +24,10 @@
#include "svn_pools.h"
#include "svn_dirent_uri.h"
#include "svn_sorts.h"
-#include "private/svn_temp_serializer.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_subr_private.h"
#include "private/svn_string_private.h"
+#include "private/svn_temp_serializer.h"
#include "fs_x.h"
#include "pack.h"
Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Fri Jan 3 16:10:59 2014
@@ -43,8 +43,9 @@
#include "index.h"
#include "private/svn_fs_util.h"
-#include "private/svn_subr_private.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_string_private.h"
+#include "private/svn_subr_private.h"
#include "../libsvn_fs/fs-loader.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/libsvn_ra/compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/compat.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/compat.c (original)
+++ subversion/trunk/subversion/libsvn_ra/compat.c Fri Jan 3 16:10:59 2014
@@ -36,6 +36,7 @@
#include "svn_props.h"
#include "private/svn_fspath.h"
+#include "private/svn_sorts_private.h"
#include "ra_loader.h"
Modified: subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c Fri Jan 3 16:10:59 2014
@@ -36,6 +36,7 @@
#include "svn_base64.h"
#include "private/svn_dav_protocol.h"
+#include "private/svn_sorts_private.h"
#include "../libsvn_ra/ra_loader.h"
#include "ra_serf.h"
Modified: subversion/trunk/subversion/libsvn_ra_serf/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/lock.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/lock.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/lock.c Fri Jan 3 16:10:59 2014
@@ -38,6 +38,7 @@
#include "svn_sorts.h"
#include "svn_time.h"
#include "svn_private_config.h"
+#include "private/svn_sorts_private.h"
#include "ra_serf.h"
Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Fri Jan 3 16:10:59 2014
@@ -2354,7 +2354,7 @@ expat_response_handler(serf_request_t *r
apr_status_t status;
const char *data;
apr_size_t len;
- int expat_status;
+ svn_error_t *err;
svn_boolean_t at_eof = FALSE;
status = serf_bucket_read(response, PARSE_CHUNK_SIZE, &data, &len);
@@ -2373,12 +2373,11 @@ expat_response_handler(serf_request_t *r
/* ### should we have an IGNORE_ERRORS flag like the v1 parser? */
- expat_status = XML_Parse(ectx->parser, data, (int)len,
- at_eof /* isFinal */);
+ err = parse_xml(ectx->parser, data, len, at_eof /* isFinal */);
- if (at_eof
- || ectx->inner_error
- || expat_status != XML_STATUS_OK)
+ err = svn_error_compose_create(ectx->inner_error, err);
+
+ if (at_eof || err)
{
/* Release xml parser state/tables. */
apr_pool_cleanup_run(ectx->cleanup_pool, &ectx->parser,
@@ -2392,14 +2391,7 @@ expat_response_handler(serf_request_t *r
If an error is not present, THEN we go ahead and look for parsing
errors. */
- SVN_ERR(ectx->inner_error);
- if (expat_status != XML_STATUS_OK)
- return svn_error_createf(SVN_ERR_XML_MALFORMED, NULL,
- _("The %s response contains invalid XML"
- " (%d %s)"),
- ectx->handler->method,
- ectx->handler->sline.code,
- ectx->handler->sline.reason);
+ SVN_ERR(err);
/* The parsing went fine. What has the bucket told us? */
Modified: subversion/trunk/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/dump.c (original)
+++ subversion/trunk/subversion/libsvn_repos/dump.c Fri Jan 3 16:10:59 2014
@@ -38,6 +38,7 @@
#include "private/svn_mergeinfo_private.h"
#include "private/svn_fs_private.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_utf_private.h"
#include "private/svn_cache.h"
Modified: subversion/trunk/subversion/libsvn_repos/fs-wrap.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/fs-wrap.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/fs-wrap.c (original)
+++ subversion/trunk/subversion/libsvn_repos/fs-wrap.c Fri Jan 3 16:10:59 2014
@@ -37,6 +37,7 @@
#include "repos.h"
#include "private/svn_repos_private.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_utf_private.h"
#include "private/svn_fspath.h"
Modified: subversion/trunk/subversion/libsvn_subr/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cmdline.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cmdline.c Fri Jan 3 16:10:59 2014
@@ -64,6 +64,7 @@
#include "private/svn_cmdline_private.h"
#include "private/svn_utf_private.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_string_private.h"
#include "win32_crashrpt.h"
Modified: subversion/trunk/subversion/libsvn_subr/hash.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/hash.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/hash.c (original)
+++ subversion/trunk/subversion/libsvn_subr/hash.c Fri Jan 3 16:10:59 2014
@@ -41,6 +41,7 @@
#include "svn_pools.h"
#include "private/svn_dep_compat.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_subr_private.h"
Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Fri Jan 3 16:10:59 2014
@@ -35,6 +35,7 @@
#include "svn_mergeinfo.h"
#include "private/svn_fspath.h"
#include "private/svn_mergeinfo_private.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_string_private.h"
#include "private/svn_subr_private.h"
#include "svn_hash.h"
Modified: subversion/trunk/subversion/libsvn_subr/sorts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sorts.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sorts.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sorts.c Fri Jan 3 16:10:59 2014
@@ -34,6 +34,7 @@
#include "svn_path.h"
#include "svn_sorts.h"
#include "svn_error.h"
+#include "private/svn_sorts_private.h"
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Fri Jan 3 16:10:59 2014
@@ -54,8 +54,9 @@
#include "conflicts.h"
#include "workqueue.h"
-#include "private/svn_subr_private.h"
#include "private/svn_dep_compat.h"
+#include "private/svn_sorts_private.h"
+#include "private/svn_subr_private.h"
struct svn_wc_committed_queue_t
Modified: subversion/trunk/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_editor.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Fri Jan 3 16:10:59 2014
@@ -65,10 +65,11 @@
#include "svn_hash.h"
#include "svn_sorts.h"
-#include "private/svn_subr_private.h"
-#include "private/svn_wc_private.h"
#include "private/svn_diff_tree.h"
#include "private/svn_editor.h"
+#include "private/svn_sorts_private.h"
+#include "private/svn_subr_private.h"
+#include "private/svn_wc_private.h"
#include "wc.h"
#include "props.h"
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Fri Jan 3 16:10:59 2014
@@ -50,6 +50,7 @@
#include "translate.h"
#include "tree_conflicts.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_wc_private.h"
#include "private/svn_fspath.h"
#include "private/svn_editor.h"
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Jan 3 16:10:59 2014
@@ -49,6 +49,7 @@
#include "workqueue.h"
#include "token-map.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_sqlite.h"
#include "private/svn_skel.h"
#include "private/svn_wc_private.h"
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Fri Jan 3 16:10:59 2014
@@ -89,6 +89,7 @@
#include "svn_sorts.h"
#include "private/svn_skel.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_sqlite.h"
#include "private/svn_wc_private.h"
Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Fri Jan 3 16:10:59 2014
@@ -57,6 +57,7 @@
#include "private/svn_log.h"
#include "private/svn_fspath.h"
#include "private/svn_repos_private.h"
+#include "private/svn_sorts_private.h"
#include "dav_svn.h"
Modified: subversion/trunk/subversion/svn/log-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/log-cmd.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/log-cmd.c (original)
+++ subversion/trunk/subversion/svn/log-cmd.c Fri Jan 3 16:10:59 2014
@@ -37,6 +37,7 @@
#include "svn_pools.h"
#include "private/svn_cmdline_private.h"
+#include "private/svn_sorts_private.h"
#include "cl.h"
#include "cl-log.h"
Modified: subversion/trunk/subversion/svn/propget-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/propget-cmd.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/propget-cmd.c (original)
+++ subversion/trunk/subversion/svn/propget-cmd.c Fri Jan 3 16:10:59 2014
@@ -45,7 +45,7 @@
#include "cl.h"
#include "private/svn_cmdline_private.h"
-
+#include "private/svn_sorts_private.h"
/*** Code. ***/
Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Fri Jan 3 16:10:59 2014
@@ -45,9 +45,10 @@
#include "svn_user.h"
#include "svn_xml.h"
+#include "private/svn_cmdline_private.h"
#include "private/svn_opt_private.h"
+#include "private/svn_sorts_private.h"
#include "private/svn_subr_private.h"
-#include "private/svn_cmdline_private.h"
/*** Code. ***/
Modified: subversion/trunk/subversion/svnlook/svnlook.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnlook/svnlook.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/svnlook/svnlook.c (original)
+++ subversion/trunk/subversion/svnlook/svnlook.c Fri Jan 3 16:10:59 2014
@@ -55,10 +55,11 @@
#include "svn_version.h"
#include "svn_xml.h"
-#include "private/svn_diff_private.h"
#include "private/svn_cmdline_private.h"
+#include "private/svn_diff_private.h"
#include "private/svn_fspath.h"
#include "private/svn_io_private.h"
+#include "private/svn_sorts_private.h"
/*** Some convenience macros and types. ***/
Modified: subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c Fri Jan 3 16:10:59 2014
@@ -35,7 +35,7 @@
#include "../svn_test.h"
#include "svn_error.h"
-#include "svn_sorts.h"
+#include "private/svn_sorts_private.h"
/* priority queue test:
* items in the queue are simple integers, in ascending order */
Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1555133&r1=1555132&r2=1555133&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Fri Jan 3 16:10:59 2014
@@ -41,9 +41,10 @@
#include "utils.h"
-#include "private/svn_wc_private.h"
-#include "private/svn_sqlite.h"
#include "private/svn_dep_compat.h"
+#include "private/svn_sorts_private.h"
+#include "private/svn_sqlite.h"
+#include "private/svn_wc_private.h"
#include "../../libsvn_wc/wc.h"
#include "../../libsvn_wc/wc_db.h"
#include "../../libsvn_wc/workqueue.h"
Re: svn commit: r1555133 - in /subversion/trunk: ./
subversion/include/ subversion/include/private/ subversion/libsvn_client/
subversion/libsvn_delta/ subversion/libsvn_fs_fs/ subversion/libsvn_fs_x/
subversion/libsvn_ra/ subversion/libsvn_ra_serf/ subvers...
Posted by Julian Foad <ju...@btopenworld.com>.
Bert, ping?
- Julian
On 28 August 2015, Ivan Zhakov wrote:
> On 3 January 2014 at 19:11, <rh...@apache.org> wrote:
>> Author: rhuijben
>> Date: Fri Jan 3 16:10:59 2014
>> New Revision: 1555133
>>
>> URL: http://svn.apache.org/r1555133
>> Log:
>> Get rid of the ever increasing number of private apis in svn_sorts.h by adding
>> a new private/svn_sorts_private.h file with the private parts and updating the
>> needed #include-s.
>>
> [..]
>
>
>> Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
>> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1555133&r1=1555132&r2=1555133&view=diff
>> ==============================================================================
>> --- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
>> +++ subversion/trunk/subversion/libsvn_ra_serf/util.c Fri Jan 3 16:10:59 2014
>> @@ -2354,7 +2354,7 @@ expat_response_handler(serf_request_t *r
>> apr_status_t status;
>> const char *data;
>> apr_size_t len;
>> - int expat_status;
>> + svn_error_t *err;
>> svn_boolean_t at_eof = FALSE;
>>
>> status = serf_bucket_read(response, PARSE_CHUNK_SIZE, &data, &len);
>> @@ -2373,12 +2373,11 @@ expat_response_handler(serf_request_t *r
>>
>> /* ### should we have an IGNORE_ERRORS flag like the v1 parser? */
>>
>> - expat_status = XML_Parse(ectx->parser, data, (int)len,
>> - at_eof /* isFinal */);
>> + err = parse_xml(ectx->parser, data, len, at_eof /* isFinal */);
>>
>> - if (at_eof
>> - || ectx->inner_error
>> - || expat_status != XML_STATUS_OK)
>> + err = svn_error_compose_create(ectx->inner_error, err);
>> +
>> + if (at_eof || err)
>> {
>> /* Release xml parser state/tables. */
>> apr_pool_cleanup_run(ectx->cleanup_pool, &ectx->parser,
>> @@ -2392,14 +2391,7 @@ expat_response_handler(serf_request_t *r
>>
>> If an error is not present, THEN we go ahead and look for parsing
>> errors. */
>> - SVN_ERR(ectx->inner_error);
>> - if (expat_status != XML_STATUS_OK)
>> - return svn_error_createf(SVN_ERR_XML_MALFORMED, NULL,
>> - _("The %s response contains invalid XML"
>> - " (%d %s)"),
>> - ectx->handler->method,
>> - ectx->handler->sline.code,
>> - ectx->handler->sline.reason);
>> + SVN_ERR(err);
>>
>> /* The parsing went fine. What has the bucket told us? */
>>
> These changes in subversion/libsvn_ra_serf/util.c looks like unrelated
> and undocumented. Is not it?
Re: svn commit: r1555133 - in /subversion/trunk: ./
subversion/include/ subversion/include/private/ subversion/libsvn_client/
subversion/libsvn_delta/ subversion/libsvn_fs_fs/ subversion/libsvn_fs_x/
subversion/libsvn_ra/ subversion/libsvn_ra_serf/ subvers...
Posted by Ivan Zhakov <iv...@visualsvn.com>.
On 3 January 2014 at 19:11, <rh...@apache.org> wrote:
> Author: rhuijben
> Date: Fri Jan 3 16:10:59 2014
> New Revision: 1555133
>
> URL: http://svn.apache.org/r1555133
> Log:
> Get rid of the ever increasing number of private apis in svn_sorts.h by adding
> a new private/svn_sorts_private.h file with the private parts and updating the
> needed #include-s.
>
[..]
> Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1555133&r1=1555132&r2=1555133&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
> +++ subversion/trunk/subversion/libsvn_ra_serf/util.c Fri Jan 3 16:10:59 2014
> @@ -2354,7 +2354,7 @@ expat_response_handler(serf_request_t *r
> apr_status_t status;
> const char *data;
> apr_size_t len;
> - int expat_status;
> + svn_error_t *err;
> svn_boolean_t at_eof = FALSE;
>
> status = serf_bucket_read(response, PARSE_CHUNK_SIZE, &data, &len);
> @@ -2373,12 +2373,11 @@ expat_response_handler(serf_request_t *r
>
> /* ### should we have an IGNORE_ERRORS flag like the v1 parser? */
>
> - expat_status = XML_Parse(ectx->parser, data, (int)len,
> - at_eof /* isFinal */);
> + err = parse_xml(ectx->parser, data, len, at_eof /* isFinal */);
>
> - if (at_eof
> - || ectx->inner_error
> - || expat_status != XML_STATUS_OK)
> + err = svn_error_compose_create(ectx->inner_error, err);
> +
> + if (at_eof || err)
> {
> /* Release xml parser state/tables. */
> apr_pool_cleanup_run(ectx->cleanup_pool, &ectx->parser,
> @@ -2392,14 +2391,7 @@ expat_response_handler(serf_request_t *r
>
> If an error is not present, THEN we go ahead and look for parsing
> errors. */
> - SVN_ERR(ectx->inner_error);
> - if (expat_status != XML_STATUS_OK)
> - return svn_error_createf(SVN_ERR_XML_MALFORMED, NULL,
> - _("The %s response contains invalid XML"
> - " (%d %s)"),
> - ectx->handler->method,
> - ectx->handler->sline.code,
> - ectx->handler->sline.reason);
> + SVN_ERR(err);
>
> /* The parsing went fine. What has the bucket told us? */
>
These changes in subversion/libsvn_ra_serf/util.c looks like unrelated
and undocumented. Is not it?
--
Ivan Zhakov