You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/02/14 12:15:09 UTC
svn commit: r1659777 [4/9] - in /subversion/branches/remove-log-addressing:
./ build/generator/ contrib/client-side/svncopy/ notes/
subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/bindings/java...
Propchange: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 14 11:15:05 2015
@@ -60,6 +60,7 @@
/subversion/branches/nfc-nfd-aware-client/subversion/libsvn_fs_x:870276,870376
/subversion/branches/node_pool/subversion/libsvn_fs_x:1304828-1305388
/subversion/branches/performance/subversion/libsvn_fs_x:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985673,985695,985697,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,102
9339-1029340,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/pin-externals/subversion/libsvn_fs_x:1643757-1659392
/subversion/branches/py-tests-as-modules/subversion/libsvn_fs_x:956579-1033052
/subversion/branches/ra_serf-digest-authn/subversion/libsvn_fs_x:875693-876404
/subversion/branches/reintegrate-improvements/subversion/libsvn_fs_x:873853-874164
@@ -89,4 +90,4 @@
/subversion/branches/verify-keep-going/subversion/libsvn_fs_x:1439280-1492639,1546002-1546110
/subversion/branches/wc-collate-path/subversion/libsvn_fs_x:1402685-1480384
/subversion/trunk/subversion/libsvn_fs_fs:1415133-1596500,1596567,1597414,1597989,1598273,1599140,1600872,1601633,1603485-1603487,1603499,1603605,1604128,1604188,1604413-1604414,1604416-1604417,1604421,1604442,1604700,1604717,1604720,1604726,1604755,1604794,1604802,1604824,1604836,1604844,1604902-1604903,1604911,1604925,1604933,1604947,1605059-1605060,1605064-1605065,1605068,1605071-1605073,1605075,1605123,1605188-1605189,1605191,1605197,1605444,1605633,1606132,1606142,1606144,1606514,1606526,1606528,1606551,1606554,1606564,1606598-1606599,1606656,1606658,1606662,1606744,1606840,1607085,1607572,1612407,1612810,1613339,1613872,1614611,1615348,1615351-1615352,1615356,1616338-1616339,1616613,1617586,1617688,1618138,1618151,1618153,1618226,1618641,1618653,1618662,1619068,1619358,1619413,1619769,1619774,1620602,1620909,1620912,1620928,1620930,1621275,1621635,1622931,1622937,1622942,1622946,1622959-1622960,1622963,1622987,1623007,1623368,1623373,1623377,1623379,1623381,1623398,1623402,162
4011,1624265,1624512,1626246,1626871,1626873,1626886,1627497-1627498,1627502,1627947-1627949,1627966,1628083,1628093,1628158-1628159,1628161,1628392-1628393,1628415,1628427,1628676,1628738,1628762,1628764,1629854-1629855,1629857,1629865,1629873,1629875,1629879,1630067,1630070,1631049-1631051,1631075,1631115,1631171,1631180,1631185-1631186,1631196-1631197,1631239-1631240,1631548,1631550,1631563,1631567,1631588,1631598,1632646,1632776,1632849,1632851-1632853,1632856-1632857,1632868,1632908,1632926,1633232,1633617-1633618,1634872,1634875,1634879-1634880,1634920,1636478,1636483,1636629,1636644,1637184,1637186,1637330,1637358,1637363,1637393,1639319,1639322,1639335,1639348,1639352,1639355,1639358,1639414,1639419,1639426,1639430,1639436,1639440,1639549,1640061-1640062,1640197,1640915,1640966,1641013,1643139,1643233,1645567,1646021,1646712,1646716,1647537,1647540-1647541,1647820,1647905,1648230,1648238,1648241-1648243,1648253,1648272,1648532,1648537-1648539,1648542,1648591,1648612,1653608,
1658482
-/subversion/trunk/subversion/libsvn_fs_x:1414756-1509914,1603891-1659290
+/subversion/trunk/subversion/libsvn_fs_x:1414756-1509914,1603891-1659776
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/cached_data.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/cached_data.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/cached_data.c Sat Feb 14 11:15:05 2015
@@ -343,7 +343,7 @@ get_node_revision_body(svn_fs_x__noderev
key.second = offset;
SVN_ERR(svn_cache__get_partial((void **)noderev_p, &is_cached,
- ffd->noderevs_container_cache, &key,
+ ffd->noderevs_container_cache, &key,
svn_fs_x__noderevs_get_func,
&sub_item, result_pool));
if (is_cached)
@@ -500,7 +500,7 @@ typedef struct rep_state_t
apr_uint32_t sub_item;
apr_off_t current;/* The current offset relative to START. */
apr_off_t size; /* The on-disk size of the representation. */
- int ver; /* If a delta, what svndiff version?
+ int ver; /* If a delta, what svndiff version?
-1 for unknown delta version. */
int chunk_index; /* number of the window to read */
} rep_state_t;
@@ -982,7 +982,7 @@ typedef struct rep_read_baton_t
/* The text we've been reading, if we're going to cache it. */
svn_stringbuf_t *current_fulltext;
- /* If not NULL, attempt to read the data from this cache.
+ /* If not NULL, attempt to read the data from this cache.
Once that lookup fails, reset it to NULL. */
svn_cache__t *fulltext_cache;
@@ -1054,7 +1054,7 @@ get_cached_window_sizes_func(void **out,
window_sizes_t *result = apr_palloc(pool, sizeof(*result));
result->packed_len = window->end_offset - window->start_offset;
result->target_len = txdelta_window->tview_len;
-
+
*out = result;
return SVN_NO_ERROR;
@@ -1741,7 +1741,7 @@ read_rep_header(svn_fs_x__rep_header_t *
{
svn_fs_x__data_t *ffd = fs->fsap_data;
svn_boolean_t is_cached = FALSE;
-
+
if (ffd->rep_header_cache)
{
SVN_ERR(svn_cache__get((void**)rep_header, &is_cached,
@@ -1769,13 +1769,13 @@ svn_fs_x__get_representation_length(svn_
svn_fs_x__representation_cache_key_t key = { 0 };
rep_state_t rs = { 0 };
svn_fs_x__rep_header_t *rep_header;
-
+
/* this function does not apply to representation containers */
SVN_ERR_ASSERT(entry->type >= SVN_FS_X__ITEM_TYPE_FILE_REP
&& entry->type <= SVN_FS_X__ITEM_TYPE_DIR_PROPS);
SVN_ERR_ASSERT(entry->item_count == 1);
- /* get / read the representation header */
+ /* get / read the representation header */
key.revision = svn_fs_x__get_revnum(entry->items[0].change_set);
key.is_packed = svn_fs_x__is_packed_rev(fs, key.revision);
key.item_index = entry->items[0].number;
@@ -1805,7 +1805,7 @@ get_contents_from_windows(rep_read_baton
char *cur = buf;
rep_state_t *rs;
- /* Special case for when there are no delta reps, only a
+ /* Special case for when there are no delta reps, only a
containered text. */
if (rb->rs_list->nelts == 0 && rb->buf == NULL)
{
@@ -2106,7 +2106,7 @@ rep_read_contents(void *baton,
&rb->src_state, rb->fs, &rb->rep,
rb->filehandle_pool, rb->scratch_pool));
- /* In case we did read from the fulltext cache before, make the
+ /* In case we did read from the fulltext cache before, make the
* window stream catch up. Also, initialize the fulltext buffer
* if we want to cache the fulltext at the end. */
SVN_ERR(skip_contents(rb, rb->fulltext_delivered));
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/changes.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/changes.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/changes.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/changes.c Sat Feb 14 11:15:05 2015
@@ -187,7 +187,7 @@ svn_fs_x__changes_append_list(apr_size_t
apr_array_header_t *list)
{
int i;
-
+
/* CHANGES must be in 'builder' mode */
SVN_ERR_ASSERT(changes->builder);
SVN_ERR_ASSERT(changes->paths == NULL);
@@ -272,7 +272,7 @@ svn_fs_x__changes_get_list(apr_array_hea
change->copyfrom_rev = binary_change->copyfrom_rev;
change->copyfrom_known = TRUE;
if (SVN_IS_VALID_REVNUM(binary_change->copyfrom_rev))
- change->copyfrom_path
+ change->copyfrom_path
= svn_fs_x__string_table_get(changes->paths,
binary_change->copyfrom_path,
NULL,
@@ -338,7 +338,7 @@ svn_fs_x__write_changes_container(svn_st
/* write to disk */
SVN_ERR(svn_fs_x__write_string_table(stream, paths, scratch_pool));
SVN_ERR(svn_packed__data_write(stream, root, scratch_pool));
-
+
return SVN_NO_ERROR;
}
@@ -394,7 +394,7 @@ svn_fs_x__read_changes_container(svn_fs_
}
*changes_p = changes;
-
+
return SVN_NO_ERROR;
}
@@ -520,7 +520,7 @@ svn_fs_x__changes_get_list_func(void **o
change->copyfrom_rev = binary_change->copyfrom_rev;
change->copyfrom_known = TRUE;
if (SVN_IS_VALID_REVNUM(binary_change->copyfrom_rev))
- change->copyfrom_path
+ change->copyfrom_path
= svn_fs_x__string_table_get_func(paths,
binary_change->copyfrom_path,
NULL,
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/dag.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/dag.h?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/dag.h (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/dag.h Sat Feb 14 11:15:05 2015
@@ -209,7 +209,7 @@ svn_fs_x__dag_node_kind(dag_node_t *node
If properties do not exist on NODE, *PROPLIST_P will be set to
NULL.
- Allocate the result in RESULT_POOL and use SCRATCH_POOL for temporaries.
+ Allocate the result in RESULT_POOL and use SCRATCH_POOL for temporaries.
*/
svn_error_t *
svn_fs_x__dag_get_proplist(apr_hash_t **proplist_p,
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs.h?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs.h Sat Feb 14 11:15:05 2015
@@ -267,7 +267,7 @@ typedef struct svn_fs_x__data_t
/* Rev / pack file granularity covered by phys-to-log index pages */
apr_int64_t p2l_page_size;
-
+
/* The revision that was youngest, last time we checked. */
svn_revnum_t youngest_rev_cache;
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs_id.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs_id.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs_id.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs_id.c Sat Feb 14 11:15:05 2015
@@ -48,7 +48,7 @@ typedef struct fs_x__id_t
/* The state machine behind this is as follows:
-
+
(A) FS passed in during context construction still open and uses a
different pool as the context (Usually the initial state). In that
case, FS_PATH is NULL and we watch for either pool's cleanup.
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs_x.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs_x.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs_x.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs_x.c Sat Feb 14 11:15:05 2015
@@ -591,7 +591,7 @@ svn_fs_x__open(svn_fs_t *fs,
fs, scratch_pool));
}
-/* Baton type bridging svn_fs_x__upgrade and upgrade_body carrying
+/* Baton type bridging svn_fs_x__upgrade and upgrade_body carrying
* parameters over between them. */
typedef struct upgrade_baton_t
{
@@ -645,7 +645,7 @@ svn_fs_x__upgrade(svn_fs_t *fs,
baton.notify_baton = notify_baton;
baton.cancel_func = cancel_func;
baton.cancel_baton = cancel_baton;
-
+
return svn_fs_x__with_all_locks(fs, upgrade_body, (void *)&baton,
scratch_pool);
}
@@ -799,7 +799,7 @@ svn_fs_x__file_checksum(svn_checksum_t *
{
svn_checksum_t temp;
temp.kind = kind;
-
+
switch(kind)
{
case svn_checksum_md5:
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/hotcopy.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/hotcopy.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/hotcopy.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/hotcopy.c Sat Feb 14 11:15:05 2015
@@ -366,7 +366,7 @@ hotcopy_copy_packed_shard(svn_boolean_t
return SVN_NO_ERROR;
}
-/* Remove file PATH, if it exists - even if it is read-only.
+/* Remove file PATH, if it exists - even if it is read-only.
* Use SCRATCH_POOL for temporary allocations. */
static svn_error_t *
hotcopy_remove_file(const char *path,
@@ -683,7 +683,7 @@ hotcopy_revisions(svn_fs_t *src_fs,
/* Copy the revprop file. */
SVN_ERR(hotcopy_copy_shard_file(&skipped, src_revprops_dir,
dst_revprops_dir,
- rev, max_files_per_dir,
+ rev, max_files_per_dir,
iterpool));
/* Whenever this revision did not previously exist in the destination,
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/hotcopy.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/hotcopy.h?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/hotcopy.h (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/hotcopy.h Sat Feb 14 11:15:05 2015
@@ -40,7 +40,7 @@ svn_fs_x__hotcopy_prepare_target(svn_fs_
* not re-copy data which already exists in DST_FS. Indicate progress via
* the optional NOTIFY_FUNC callback using NOTIFY_BATON.
* Use SCRATCH_POOL for temporary allocations. */
-svn_error_t *
+svn_error_t *
svn_fs_x__hotcopy(svn_fs_t *src_fs,
svn_fs_t *dst_fs,
svn_boolean_t incremental,
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/index.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/index.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/index.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/index.c Sat Feb 14 11:15:05 2015
@@ -88,7 +88,7 @@ typedef struct l2p_page_table_entry_t
/* Master run-time data structure of an log-to-phys index. It contains
* the page tables of every revision covered by that index - but not the
- * pages themselves.
+ * pages themselves.
*/
typedef struct l2p_header_t
{
@@ -732,7 +732,7 @@ stream_write_encoded(svn_stream_t *strea
apr_uint64_t value)
{
unsigned char encoded[ENCODED_INT_LENGTH];
-
+
apr_size_t len = encode_uint(encoded, value);
return svn_error_trace(svn_stream_write(stream, (char *)encoded, &len));
}
@@ -813,7 +813,7 @@ encode_l2p_page(apr_array_header_t *entr
int container_count = 0;
apr_uint64_t last_offset = 0;
int i;
-
+
apr_size_t data_size = count * sizeof(l2p_page_entry_t);
svn_stringbuf_t *container_offsets
= svn_stringbuf_create_ensure(count * 2, scratch_pool);
@@ -939,7 +939,7 @@ svn_fs_x__l2p_index_append(svn_checksum_
* The current implementation is limited to 2G entries per page. */
if (ffd->l2p_page_size > APR_INT32_MAX)
return svn_error_createf(SVN_ERR_FS_INDEX_OVERFLOW , NULL,
- _("L2P index page size %s"
+ _("L2P index page size %s"
" exceeds current limit of 2G entries"),
apr_psprintf(local_pool, "%" APR_UINT64_T_FMT,
ffd->l2p_page_size));
@@ -1496,7 +1496,7 @@ get_l2p_page(l2p_page_t **page,
container_offsets[i] = (apr_off_t)last_value - 1;
/* '-1' is represented as '0' in the index file */
}
-
+
/* read all page entries (offsets in rev file and container sub-items) */
for (i = 0; i < result->entry_count; ++i)
{
@@ -1544,14 +1544,14 @@ typedef struct l2p_page_baton_t
/* offset within the cached page */
apr_uint32_t page_offset;
-
+
/* out data */
/* absolute item or container offset in rev / pack file */
apr_off_t offset;
/* 0 -> container / item itself; sub-item in container otherwise */
apr_uint32_t sub_item;
-
+
} l2p_page_baton_t;
/* Return the rev / pack file offset of the item at BATON->PAGE_OFFSET in
@@ -1650,7 +1650,7 @@ l2p_page_table_access_func(void **out,
/* set output as a courtesy to the caller */
*out = table_baton->pages;
-
+
return SVN_NO_ERROR;
}
@@ -1931,7 +1931,7 @@ l2p_proto_index_lookup(apr_off_t *offset
}
SVN_ERR(svn_io_file_close(file, scratch_pool));
-
+
return SVN_NO_ERROR;
}
@@ -2451,7 +2451,7 @@ p2l_page_info_copy(p2l_page_info_baton_t
const p2l_header_t *header,
const apr_off_t *offsets)
{
- /* if the requested offset is out of bounds, return info for
+ /* if the requested offset is out of bounds, return info for
* a zero-sized empty page right behind the last page.
*/
if (baton->offset / header->page_size < header->page_count)
@@ -2533,7 +2533,7 @@ get_p2l_header(p2l_header_t **header,
/* allocate result data structure */
result = apr_pcalloc(result_pool, sizeof(*result));
-
+
/* Read table sizes, check them for plausibility and allocate page array. */
SVN_ERR(packed_stream_get(&value, rev_file->p2l_stream));
result->first_revision = (svn_revnum_t)value;
@@ -2870,7 +2870,7 @@ get_p2l_keys(p2l_page_info_baton_t *page
apr_pool_t *scratch_pool)
{
p2l_page_info_baton_t page_info;
-
+
/* request info for the index pages that describes the pack / rev file
* contents at pack / rev file position OFFSET. */
page_info.offset = offset;
@@ -2896,7 +2896,7 @@ get_p2l_keys(p2l_page_info_baton_t *page
key.is_packed = svn_fs_x__is_packed_rev(fs, revision);
key.page = page_info.page_no;
- *key_p = key;
+ *key_p = key;
}
return SVN_NO_ERROR;
@@ -3607,7 +3607,7 @@ compare_p2l_info_rev(const sub_item_orde
{
svn_fs_x__id_t *lhs_part;
svn_fs_x__id_t *rhs_part;
-
+
assert(lhs != rhs);
if (lhs->entry->item_count == 0)
return rhs->entry->item_count == 0 ? 0 : -1;
@@ -3936,7 +3936,7 @@ svn_fs_x__serialize_p2l_page(void **data
table_size);
for (i = 0; i < page->nelts; ++i)
- svn_temp_serializer__add_leaf(context,
+ svn_temp_serializer__add_leaf(context,
(const void * const *)&entries[i].items,
entries[i].item_count
* sizeof(*entries[i].items));
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/index.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/index.h?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/index.h (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/index.h Sat Feb 14 11:15:05 2015
@@ -61,7 +61,7 @@ typedef struct svn_fs_x__p2l_entry_t
{
/* offset of the first byte that belongs to the item */
apr_off_t offset;
-
+
/* length of the item in bytes */
apr_off_t size;
@@ -110,7 +110,7 @@ svn_fs_x__l2p_proto_index_add_revision(a
* (OFFSET, SUB_ITEM) may be (-1, 0) to mark 'invalid' item indexes but
* that is already implied for all item indexes not explicitly given a
* mapping.
- *
+ *
* Use SCRATCH_POOL for temporary allocations.
*/
svn_error_t *
@@ -123,7 +123,7 @@ svn_fs_x__l2p_proto_index_add_entry(apr_
/* Use the proto index file stored at PROTO_FILE_NAME, construct the final
* log-to-phys index and append it to INDEX_FILE. The first revision will
* be REVISION, entries to the next revision will be assigned to REVISION+1
- * and so forth.
+ * and so forth.
*
* Return the MD5 checksum of the on-disk index data in *CHECKSUM, allocated
* in RESULT_POOL. Use SCRATCH_POOL for temporary allocations.
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/lock.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/lock.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/lock.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/lock.c Sat Feb 14 11:15:05 2015
@@ -370,7 +370,7 @@ set_lock(const char *fs_path,
SVN_ERR(read_digest_file(&children, NULL, fs_path, digest_path,
scratch_pool));
- SVN_ERR(write_digest_file(children, lock, fs_path, digest_path,
+ SVN_ERR(write_digest_file(children, lock, fs_path, digest_path,
perms_reference, scratch_pool));
return SVN_NO_ERROR;
@@ -422,7 +422,7 @@ add_to_digest(const char *fs_path,
}
if (apr_hash_count(children) != original_count)
- SVN_ERR(write_digest_file(children, lock, fs_path, index_digest_path,
+ SVN_ERR(write_digest_file(children, lock, fs_path, index_digest_path,
perms_reference, scratch_pool));
return SVN_NO_ERROR;
@@ -457,7 +457,7 @@ delete_from_digest(const char *fs_path,
}
if (apr_hash_count(children) || lock)
- SVN_ERR(write_digest_file(children, lock, fs_path, index_digest_path,
+ SVN_ERR(write_digest_file(children, lock, fs_path, index_digest_path,
perms_reference, scratch_pool));
else
SVN_ERR(svn_io_remove_file2(index_digest_path, TRUE, scratch_pool));
@@ -925,7 +925,7 @@ lock_body(void *baton, apr_pool_t *pool)
index is inconsistent, svn_fs_x__allow_locked_operation will
show locked on the file but unlocked on the parent. */
-
+
while (outstanding)
{
const char *last_path = NULL;
@@ -1009,7 +1009,7 @@ lock_body(void *baton, apr_pool_t *pool)
rev_0_path, iterpool));
}
}
-
+
return SVN_NO_ERROR;
}
@@ -1277,7 +1277,7 @@ svn_fs_x__lock(svn_fs_t *fs,
info->fs_err = svn_error_createf(SVN_ERR_FS_LOCK_OPERATION_FAILED,
0, _("Failed to lock '%s'"),
info->path);
-
+
cb_err = lock_callback(lock_baton, info->path, info->lock,
info->fs_err, scratch_pool);
}
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/lock.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/lock.h?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/lock.h (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/lock.h Sat Feb 14 11:15:05 2015
@@ -60,7 +60,7 @@ svn_fs_x__unlock(svn_fs_t *fs,
void *lock_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-
+
/* See svn_fs_get_lock(). */
svn_error_t *
svn_fs_x__get_lock(svn_lock_t **lock,
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/low_level.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/low_level.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/low_level.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/low_level.c Sat Feb 14 11:15:05 2015
@@ -588,7 +588,7 @@ format_digest(const unsigned char *diges
svn_checksum_t checksum;
checksum.digest = digest;
checksum.kind = kind;
-
+
if (is_null)
return "(null)";
@@ -754,7 +754,7 @@ svn_fs_x__write_rep_header(svn_fs_x__rep
apr_pool_t *scratch_pool)
{
const char *text;
-
+
switch (header->type)
{
case svn_fs_x__rep_self_delta:
@@ -1004,7 +1004,7 @@ svn_fs_x__read_changes_incrementally(svn
}
while (change);
svn_pool_destroy(iterpool);
-
+
return SVN_NO_ERROR;
}
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/low_level.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/low_level.h?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/low_level.h (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/low_level.h Sat Feb 14 11:15:05 2015
@@ -49,7 +49,7 @@ extern "C" {
* and return the start offsets of the index data in *L2P_OFFSET and
* *P2L_OFFSET, respectively. Also, return the expected checksums in
* in *L2P_CHECKSUM and *P2L_CHECKSUM.
- *
+ *
* Note that REV is only used to construct nicer error objects that
* mention this revision. Allocate the checksums in RESULT_POOL.
*/
@@ -160,7 +160,7 @@ svn_fs_x__read_rep_header(svn_fs_x__rep_
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Write the representation HEADER to STREAM.
+/* Write the representation HEADER to STREAM.
* Use SCRATCH_POOL for allocations. */
svn_error_t *
svn_fs_x__write_rep_header(svn_fs_x__rep_header_t *header,
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/noderevs.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/noderevs.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/noderevs.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/noderevs.c Sat Feb 14 11:15:05 2015
@@ -50,7 +50,7 @@
#define NODEREV_HAS_CPATH 0x00040
/* Our internal representation of a svn_fs_x__noderev_t.
- *
+ *
* We will store path strings in a string container and reference them
* from here. Similarly, IDs and representations are being stored in
* separate containers and then also referenced here. This eliminates
@@ -274,7 +274,7 @@ svn_fs_x__noderevs_add(svn_fs_x__noderev
0);
binary_noderev.mergeinfo_count = noderev->mergeinfo_count;
-
+
APR_ARRAY_PUSH(container->noderevs, binary_noderev_t) = binary_noderev;
return container->noderevs->nelts - 1;
@@ -574,7 +574,7 @@ svn_fs_x__write_noderevs_container(svn_s
/* write to disk */
SVN_ERR(svn_fs_x__write_string_table(stream, paths, scratch_pool));
SVN_ERR(svn_packed__data_write(stream, root, scratch_pool));
-
+
return SVN_NO_ERROR;
}
@@ -724,7 +724,7 @@ svn_fs_x__read_noderevs_container(svn_fs
}
*container = noderevs;
-
+
return SVN_NO_ERROR;
}
@@ -905,7 +905,7 @@ svn_fs_x__mergeinfo_count_get_func(void
/* Resolve all container pointers */
resolve_apr_array_header(&noderevs, container, &container->noderevs);
binary_noderev = &APR_ARRAY_IDX(&noderevs, idx, binary_noderev_t);
-
+
*(apr_int64_t *)out = binary_noderev->mergeinfo_count;
return SVN_NO_ERROR;
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/pack.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/pack.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/pack.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/pack.c Sat Feb 14 11:15:05 2015
@@ -70,7 +70,7 @@
* each of the 4 buckets separately. The first three will simply order
* their items by revision, starting with the newest once. Placing rep
* and noderev items is a more elaborate process documented in the code.
- *
+ *
* In short, we store items in the following order:
* - changed paths lists
* - node property
@@ -269,7 +269,7 @@ initialize_pack_context(pack_context_t *
context->start_rev = shard_rev;
context->end_rev = shard_rev;
context->shard_end_rev = shard_rev + ffd->max_files_per_dir;
-
+
/* Create the new directory and pack file. */
context->shard_dir = shard_dir;
context->pack_file_dir = pack_file_dir;
@@ -346,7 +346,7 @@ reset_pack_context(pack_context_t *conte
SVN_ERR(svn_io_file_trunc(context->reps_file, 0, scratch_pool));
svn_pool_clear(context->info_pool);
-
+
return SVN_NO_ERROR;
}
@@ -375,7 +375,7 @@ close_pack_context(pack_context_t *conte
SVN_ERR(svn_fs_x__add_index_data(context->fs, context->pack_file,
proto_l2p_index_path,
proto_p2l_index_path,
- context->shard_rev,
+ context->shard_rev,
scratch_pool));
/* remove proto index files */
@@ -401,7 +401,7 @@ copy_file_data(pack_context_t *context,
/* most non-representation items will be small. Minimize the buffer
* and infrastructure overhead in that case. */
enum { STACK_BUFFER_SIZE = 1024 };
-
+
if (size < STACK_BUFFER_SIZE)
{
/* copy small data using a fixed-size buffer on stack */
@@ -484,10 +484,10 @@ copy_item_to_temp(pack_context_t *contex
SVN_ERR(svn_fs_x__get_file_offset(&new_entry->offset, temp_file,
scratch_pool));
APR_ARRAY_PUSH(entries, svn_fs_x__p2l_entry_t *) = new_entry;
-
+
SVN_ERR(copy_file_data(context, temp_file, rev_file->file, entry->size,
scratch_pool));
-
+
return SVN_NO_ERROR;
}
@@ -749,7 +749,7 @@ compare_p2l_info(const svn_fs_x__p2l_ent
return (*lhs)->item_count == 0 ? 0 : -1;
if ((*lhs)->item_count == 0)
return 1;
-
+
if ((*lhs)->items[0].change_set == (*rhs)->items[0].change_set)
return (*lhs)->items[0].number > (*rhs)->items[0].number ? -1 : 1;
@@ -842,7 +842,7 @@ auto_pad_block(pack_context_t *context,
apr_pool_t *scratch_pool)
{
svn_fs_x__data_t *ffd = context->fs->fsap_data;
-
+
/* This is the maximum number of bytes "wasted" that way per block.
* Larger items will cross the block boundaries. */
const apr_off_t max_padding = MAX(ffd->block_size / 50, 512);
@@ -873,7 +873,7 @@ auto_pad_block(pack_context_t *context,
return SVN_NO_ERROR;
}
-/* Return the index of the first entry in CONTEXT->REFERENCES that
+/* Return the index of the first entry in CONTEXT->REFERENCES that
* references ITEM->ITEMS[0] if such entries exist. All matching items
* will be consecutive.
*/
@@ -886,7 +886,7 @@ find_first_reference(pack_context_t *con
while (lower <= upper)
{
- int current = lower + (upper - lower) / 2;
+ int current = lower + (upper - lower) / 2;
reference_t *reference
= APR_ARRAY_IDX(context->references, current, reference_t *);
@@ -1005,7 +1005,7 @@ reps_fit_into_containers(apr_array_heade
return TRUE;
}
-/* Write the *CONTAINER containing the noderevs described by the
+/* Write the *CONTAINER containing the noderevs described by the
* svn_fs_x__p2l_entry_t * in ITEMS to the pack file on CONTEXT.
* Append a P2L entry for the container to CONTAINER->REPS.
* Afterwards, clear ITEMS and re-allocate *CONTAINER in CONTAINER_POOL
@@ -1072,8 +1072,8 @@ write_nodes_container(pack_context_t *co
* from TEMP_FILE and add them to *CONTAINER and NODES_IN_CONTAINER.
* Whenever the container grows bigger than the current block in CONTEXT,
* write the data to disk and continue in the next block.
- *
- * Use CONTAINER_POOL to re-allocate the *CONTAINER as necessary and
+ *
+ * Use CONTAINER_POOL to re-allocate the *CONTAINER as necessary and
* SCRATCH_POOL to temporary allocations.
*/
static svn_error_t *
@@ -1430,7 +1430,7 @@ copy_reps_from_temp(pack_context_t *cont
nodes_in_container, container_pool, iterpool));
/* actually flush the noderevs to disk if the reps container is likely
- * to fill the block, i.e. no further noderevs will be added to the
+ * to fill the block, i.e. no further noderevs will be added to the
* nodes container. */
if (should_flush_nodes_container(context, nodes_container, node_parts))
SVN_ERR(write_nodes_container(context, &nodes_container,
@@ -1730,7 +1730,7 @@ pack_range(pack_context_t *context,
/* store the indirect array index */
APR_ARRAY_PUSH(context->rev_offsets, int) = context->reps->nelts;
-
+
/* read the phys-to-log index file until we covered the whole rev file.
* That index contains enough info to build both target indexes from it. */
while (offset < rev_file->l2p_offset)
@@ -1826,7 +1826,7 @@ pack_range(pack_context_t *context,
SVN_ERR(write_l2p_index(context, revpool));
svn_pool_destroy(revpool);
-
+
return SVN_NO_ERROR;
}
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/reps.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/reps.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/reps.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/reps.c Sat Feb 14 11:15:05 2015
@@ -34,7 +34,7 @@
/* Length of the text chunks we hash and match. The algorithm will find
* most matches with a length of 2 * MATCH_BLOCKSIZE and only specific
* ones that are shorter than MATCH_BLOCKSIZE.
- *
+ *
* This should be a power of two and must be a multiple of 8.
* Good choices are 32, 64 and 128.
*/
@@ -55,7 +55,7 @@
/* Byte strings are described by a series of copy instructions that each
* do one of the following
- *
+ *
* - copy a given number of bytes from the text corpus starting at a
* given offset
* - reference other instruction and specify how many of instructions of
@@ -244,7 +244,7 @@ struct svn_fs_x__rep_extractor_t
/* bases (base_t) yet to process (not used ATM) */
apr_array_header_t *bases;
-
+
/* missing sections (missing_t) in result->data that need to be filled,
* yet */
apr_array_header_t *missing;
@@ -627,7 +627,7 @@ get_text(svn_fs_x__rep_extractor_t *extr
missing.count = instruction->count;
missing.offset = instruction->offset;
svn_stringbuf_appendfill(extractor->result, 0, instruction->count);
-
+
if (extractor->missing == NULL)
extractor->missing = apr_array_make(extractor->pool, 1,
sizeof(missing));
@@ -723,7 +723,7 @@ svn_fs_x__write_reps_container(svn_strea
svn_packed__create_int_substream(instructions_stream, TRUE, TRUE);
svn_packed__create_int_substream(instructions_stream, FALSE, FALSE);
-
+
/* text */
svn_packed__add_bytes(text_stream, builder->text->data, builder->text->len);
@@ -760,7 +760,7 @@ svn_fs_x__write_reps_container(svn_strea
/* write to stream */
SVN_ERR(svn_packed__data_write(stream, root, scratch_pool));
-
+
return SVN_NO_ERROR;
}
@@ -787,7 +787,7 @@ svn_fs_x__read_reps_container(svn_fs_x__
/* read from disk */
SVN_ERR(svn_packed__data_read(&root, stream, result_pool, scratch_pool));
-
+
bases_stream = svn_packed__first_int_stream(root);
reps_stream = svn_packed__next_int_stream(bases_stream);
instructions_stream = svn_packed__next_int_stream(reps_stream);
@@ -848,7 +848,7 @@ svn_fs_x__read_reps_container(svn_fs_x__
/* return result */
*container = reps;
-
+
return SVN_NO_ERROR;
}
@@ -924,7 +924,7 @@ svn_fs_x__reps_get_func(void **out,
apr_pool_t *pool)
{
svn_fs_x__reps_baton_t *reps_baton = baton;
-
+
/* get a usable reps structure */
const svn_fs_x__reps_t *cached = data;
svn_fs_x__reps_t *reps = apr_pmemdup(pool, cached, sizeof(*reps));
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/rev_file.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/rev_file.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/rev_file.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/rev_file.c Sat Feb 14 11:15:05 2015
@@ -162,7 +162,7 @@ open_pack_or_rev_file(svn_fs_x__revision
/* We may have to *temporarily* enable write access. */
err = writable ? auto_make_writable(path, result_pool, scratch_pool)
- : SVN_NO_ERROR;
+ : SVN_NO_ERROR;
/* open the revision file in buffered r/o or r/w mode */
if (!err)
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/revprops.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/revprops.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/revprops.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/revprops.c Sat Feb 14 11:15:05 2015
@@ -122,7 +122,7 @@ svn_fs_x__upgrade_cleanup_pack_revprops(
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
const char *revsprops_dir = svn_dirent_join(fs->path, PATH_REVPROPS_DIR,
scratch_pool);
-
+
/* delete the non-packed revprops shards afterwards */
for (shard = 0; shard < first_unpacked_shard; ++shard)
{
@@ -660,7 +660,7 @@ typedef struct packed_revprops_t
* our file system, the revprops belong to REVISION and the global revprop
* GENERATION is used as well.
*
- * The returned hash will be allocated in RESULT_POOL, SCRATCH_POOL is
+ * The returned hash will be allocated in RESULT_POOL, SCRATCH_POOL is
* being used for temporary allocations.
*/
static svn_error_t *
@@ -942,7 +942,7 @@ parse_packed_revprops(svn_fs_t *fs,
if (read_all)
{
/* Init / construct REVPROPS members. */
- revprops->sizes = apr_array_make(result_pool, (int)count,
+ revprops->sizes = apr_array_make(result_pool, (int)count,
sizeof(offset));
revprops->offsets = apr_array_make(result_pool, (int)count,
sizeof(offset));
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/revprops.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/revprops.h?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/revprops.h (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/revprops.h Sat Feb 14 11:15:05 2015
@@ -40,12 +40,12 @@ svn_fs_x__reset_revprop_generation_file(
apr_pool_t *scratch_pool);
/* In the filesystem FS, pack all revprop shards up to min_unpacked_rev.
- *
+ *
* NOTE: Keep the old non-packed shards around until after the format bump.
* Otherwise, re-running upgrade will drop the packed revprop shard but
* have no unpacked data anymore. Call upgrade_cleanup_pack_revprops after
* the bump.
- *
+ *
* NOTIFY_FUNC and NOTIFY_BATON as well as CANCEL_FUNC and CANCEL_BATON are
* used in the usual way. Temporary allocations are done in SCRATCH_POOL.
*/
@@ -59,7 +59,7 @@ svn_fs_x__upgrade_pack_revprops(svn_fs_t
/* In the filesystem FS, remove all non-packed revprop shards up to
* min_unpacked_rev. Temporary allocations are done in SCRATCH_POOL.
- *
+ *
* NOTIFY_FUNC and NOTIFY_BATON as well as CANCEL_FUNC and CANCEL_BATON are
* used in the usual way. Cancellation is supported in the sense that we
* will cleanly abort the operation. However, there will be remnant shards
@@ -100,7 +100,7 @@ svn_fs_x__set_revision_proplist(svn_fs_t
/* Return TRUE, if for REVISION in FS, we can find the revprop pack file.
* Use SCRATCH_POOL for temporary allocations.
- * Set *MISSING, if the reason is a missing manifest or pack file.
+ * Set *MISSING, if the reason is a missing manifest or pack file.
*/
svn_boolean_t
svn_fs_x__packed_revprop_available(svn_boolean_t *missing,
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/string_table.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/string_table.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/string_table.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/string_table.c Sat Feb 14 11:15:05 2015
@@ -128,7 +128,7 @@ svn_fs_x__string_table_builder_create(ap
result->tables = apr_array_make(result_pool, 1, sizeof(builder_table_t *));
add_table(result);
-
+
return result;
}
@@ -146,7 +146,7 @@ balance(builder_table_t *table,
node->left->right = node;
*parent = node->left;
node->left = temp;
-
+
--left_height;
}
else if (left_height + 1 < right_height)
@@ -370,7 +370,7 @@ svn_fs_x__string_table_builder_estimate_
/* ZIP compression should give us a 50% reduction.
* add some static overhead */
return 200 + total / 2;
-
+
}
static void
@@ -456,7 +456,7 @@ svn_fs_x__string_table_create(const stri
apr_pool_t *pool)
{
apr_size_t i;
-
+
string_table_t *result = apr_pcalloc(pool, sizeof(*result));
result->size = (apr_size_t)builder->tables->nelts;
result->sub_tables
@@ -610,7 +610,7 @@ svn_fs_x__write_string_table(svn_stream_
svn_packed__add_uint(table_sizes, table->size);
/* all short-string char data sizes */
-
+
for (i = 0; i < table->size; ++i)
svn_packed__add_uint(table_sizes,
table->sub_tables[i].short_string_count);
@@ -660,7 +660,7 @@ svn_fs_x__read_string_table(string_table
apr_size_t i, k;
string_table_t *table = apr_palloc(result_pool, sizeof(*table));
-
+
svn_packed__data_root_t *root;
svn_packed__int_stream_t *table_sizes;
svn_packed__byte_stream_t *large_strings;
@@ -787,7 +787,7 @@ svn_fs_x__serialize_string_table(svn_tem
(const void * const *)&string->data,
string->len + 1);
}
-
+
svn_temp_serializer__pop(context);
}
@@ -802,7 +802,7 @@ svn_fs_x__deserialize_string_table(void
{
apr_size_t i, k;
string_sub_table_t *sub_tables;
-
+
svn_temp_deserializer__resolve(buffer, (void **)table);
if (*table == NULL)
return;
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/string_table.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/string_table.h?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/string_table.h (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/string_table.h Sat Feb 14 11:15:05 2015
@@ -32,7 +32,7 @@ extern "C" {
/* A string table is a very space efficient, read-only representation for
* a set of strings with high degreed of prefix and postfix overhead.
- *
+ *
* Creating a string table is a two-stage process: Use a builder class,
* stuff all the strings in there and let it then do the heavy lifting of
* classification and compression to create the actual string table object.
@@ -101,7 +101,7 @@ svn_error_t *
svn_fs_x__read_string_table(string_table_t **table_p,
svn_stream_t *stream,
apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
+ apr_pool_t *scratch_pool);
/* Serialize string table *ST within the serialization CONTEXT.
*/
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/transaction.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/transaction.c Sat Feb 14 11:15:05 2015
@@ -474,7 +474,7 @@ svn_fs_x__with_all_locks(svn_fs_t *fs,
apr_pool_t *scratch_pool)
{
/* Be sure to use the correct lock ordering as documented in
- fs_fs_shared_data_t. The lock chain is being created in
+ fs_fs_shared_data_t. The lock chain is being created in
innermost (last to acquire) -> outermost (first to acquire) order. */
with_lock_baton_t *lock_baton
= create_lock_baton(fs, write_lock, body, baton, scratch_pool);
@@ -716,7 +716,7 @@ get_writable_proto_rev(apr_file_t **file
/* We don't want unused sections (such as leftovers from failed delta
stream) in our file. If we use log addressing, we would need an
- index entry for the unused section and that section would need to
+ index entry for the unused section and that section would need to
be all NUL by convention. So, detect and fix those cases by truncating
the protorev file. */
if (!err)
@@ -1368,7 +1368,7 @@ set_txn_proplist(svn_fs_t *fs,
SVN_ERR(svn_stream_close(stream));
/* Open the transaction properties file and write new contents to it. */
- SVN_ERR(svn_io_write_atomic((final
+ SVN_ERR(svn_io_write_atomic((final
? svn_fs_x__path_txn_props_final(fs, txn_id,
scratch_pool)
: svn_fs_x__path_txn_props(fs, txn_id,
@@ -1558,7 +1558,7 @@ write_next_ids(svn_fs_t *fs,
apr_file_t *file;
char buffer[2 * SVN_INT64_BUFFER_SIZE + 2];
char *p = buffer;
-
+
p += svn__ui64tobase36(p, node_id);
*(p++) = ' ';
p += svn__ui64tobase36(p, copy_id);
@@ -3288,7 +3288,7 @@ svn_fs_x__add_index_data(svn_fs_t *fs,
scratch_pool, scratch_pool));
/* Append footer. */
- footer = svn_fs_x__unparse_footer(l2p_offset, l2p_checksum,
+ footer = svn_fs_x__unparse_footer(l2p_offset, l2p_checksum,
p2l_offset, p2l_checksum, scratch_pool,
scratch_pool);
SVN_ERR(svn_io_file_write_full(file, footer->data, footer->len, NULL,
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/tree.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/tree.c Sat Feb 14 11:15:05 2015
@@ -1701,9 +1701,9 @@ compare_dir_structure(svn_boolean_t *cha
svn_pool_clear(iterpool);
/* Modified but not copied / replaced or anything? */
- SVN_ERR(svn_fs_x__dag_get_node(&lhs_node, fs, &lhs_entry->id,
+ SVN_ERR(svn_fs_x__dag_get_node(&lhs_node, fs, &lhs_entry->id,
iterpool, iterpool));
- SVN_ERR(svn_fs_x__dag_get_node(&rhs_node, fs, &rhs_entry->id,
+ SVN_ERR(svn_fs_x__dag_get_node(&rhs_node, fs, &rhs_entry->id,
iterpool, iterpool));
SVN_ERR(svn_fs_x__dag_same_line_of_history(&same_history,
lhs_node, rhs_node));
@@ -2110,7 +2110,7 @@ merge_changes(dag_node_t *ancestor_node,
svn_fs_t *fs = txn->fs;
svn_fs_x__txn_id_t txn_id = svn_fs_x__txn_get_id(txn);
svn_boolean_t related;
-
+
SVN_ERR(svn_fs_x__dag_txn_root(&txn_root_node, fs, txn_id, scratch_pool,
scratch_pool));
@@ -2700,7 +2700,7 @@ x_copy(svn_fs_root_t *from_root,
SVN_ERR(copy_helper(from_root,
svn_fs__canonicalize_abspath(from_path, subpool),
- to_root,
+ to_root,
svn_fs__canonicalize_abspath(to_path, subpool),
TRUE, subpool));
@@ -2939,7 +2939,7 @@ window_consumer(svn_txdelta_window_t *wi
cb->target_string. */
SVN_ERR(tb->interpreter(window, tb->interpreter_baton));
- /* Is the window NULL? If so, we're done. The stream has already been
+ /* Is the window NULL? If so, we're done. The stream has already been
closed by the interpreter. */
if (! window)
SVN_ERR(svn_fs_x__dag_finalize_edits(tb->node, tb->result_checksum,
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/util.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/util.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/util.c Sat Feb 14 11:15:05 2015
@@ -318,7 +318,7 @@ svn_fs_x__path_txn_sha1(svn_fs_t *fs,
svn_checksum_t checksum;
checksum.digest = sha1;
checksum.kind = svn_checksum_sha1;
-
+
return svn_dirent_join(svn_fs_x__path_txn_dir(fs, txn_id, pool),
svn_checksum_to_cstring(&checksum, pool),
pool);
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/verify.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/verify.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/verify.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/verify.c Sat Feb 14 11:15:05 2015
@@ -180,7 +180,7 @@ verify_index_checksum(apr_file_t *file,
const char *file_name;
SVN_ERR(svn_io_file_name_get(&file_name, file, scratch_pool));
- SVN_ERR(svn_checksum_mismatch_err(expected, actual, scratch_pool,
+ SVN_ERR(svn_checksum_mismatch_err(expected, actual, scratch_pool,
_("%s checksum mismatch in file %s"),
name, file_name));
}
@@ -768,7 +768,7 @@ verify_metadata_consistency(svn_fs_t *fs
/* Check for external corruption to the indexes. */
err = verify_index_checksums(fs, pack_start, cancel_func,
cancel_baton, iterpool);
-
+
/* two-way index check */
if (!err)
err = compare_l2p_to_p2l_index(fs, pack_start, pack_end - pack_start,
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_ra/ra_loader.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_ra/ra_loader.c Sat Feb 14 11:15:05 2015
@@ -232,6 +232,11 @@ check_ra_version(const svn_version_t *ra
svn_error_t *svn_ra_initialize(apr_pool_t *pool)
{
+#if defined(SVN_USE_DSO) && APR_HAS_DSO
+ /* Ensure that DSO subsystem is initialized early as possible if
+ we're going to use it. */
+ SVN_ERR(svn_dso_initialize2());
+#endif
return SVN_NO_ERROR;
}
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_ra_local/ra_plugin.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_ra_local/ra_plugin.c Sat Feb 14 11:15:05 2015
@@ -1399,7 +1399,7 @@ lock_cb(void *lock_baton,
b->cb_err = b->lock_func(b->lock_baton, path, b->is_lock, lock, fs_err,
pool);
}
-
+
return SVN_NO_ERROR;
}
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/ra_serf.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/ra_serf.h?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/ra_serf.h Sat Feb 14 11:15:05 2015
@@ -1078,7 +1078,7 @@ svn_ra_serf__v1_get_activity_collection(
/* Set @a VCC_URL to the default VCC for our repository based on @a
* ORIG_PATH for the session @a SESSION, ensuring that the VCC URL and
- * repository root URLs are cached in @a SESSION.
+ * repository root URLs are cached in @a SESSION.
*
* All temporary allocations will be made in @a SCRATCH_POOL. */
svn_error_t *
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/serf.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/serf.c Sat Feb 14 11:15:05 2015
@@ -238,7 +238,7 @@ load_config(svn_ra_serf__session_t *sess
SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS,
SVN_CONFIG_DEFAULT_OPTION_HTTP_MAX_CONNECTIONS));
- /* Should we use chunked transfer encoding. */
+ /* Should we use chunked transfer encoding. */
SVN_ERR(svn_config_get_tristate(config, &chunked_requests,
SVN_CONFIG_SECTION_GLOBAL,
SVN_CONFIG_OPTION_HTTP_CHUNKED_REQUESTS,
@@ -305,7 +305,7 @@ load_config(svn_ra_serf__session_t *sess
SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS,
session->max_connections));
- /* Should we use chunked transfer encoding. */
+ /* Should we use chunked transfer encoding. */
SVN_ERR(svn_config_get_tristate(config, &chunked_requests,
server_group,
SVN_CONFIG_OPTION_HTTP_CHUNKED_REQUESTS,
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/update.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/update.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/update.c Sat Feb 14 11:15:05 2015
@@ -785,7 +785,7 @@ get_best_connection(report_context_t *ct
}
conn = ctx->sess->conns[best_conn];
#else
- /* We don't know how many requests are pending per connection, so just
+ /* We don't know how many requests are pending per connection, so just
cycle them. */
conn = ctx->sess->conns[ctx->sess->cur_conn];
ctx->sess->cur_conn++;
@@ -1053,7 +1053,7 @@ close_file(file_baton_t *file,
### Given that we only fetch props on additions, is this really necessary?
Or is it covering up old local copy bugs where we copied locks to other
paths? */
- if (!ctx->add_props_included
+ if (!ctx->add_props_included
&& file->lock_token && !file->found_lock_prop
&& SVN_IS_VALID_REVNUM(file->base_rev) /* file_is_added */)
{
@@ -1854,9 +1854,9 @@ update_closed(svn_ra_serf__xml_estate_t
{
const char *revstr = svn_hash_gets(attrs, "rev");
apr_int64_t rev;
-
+
SVN_ERR(svn_cstring_atoi64(&rev, revstr));
-
+
SVN_ERR(ctx->editor->set_target_revision(ctx->editor_baton,
(svn_revnum_t)rev,
scratch_pool));
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/util.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/util.c Sat Feb 14 11:15:05 2015
@@ -1385,7 +1385,7 @@ handle_response(serf_request_t *request,
return svn_error_trace(
svn_ra_serf__handle_server_error(handler->server_error,
handler,
- request, response,
+ request, response,
serf_status,
scratch_pool));
}
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/client.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/client.c Sat Feb 14 11:15:05 2015
@@ -1105,11 +1105,11 @@ static svn_error_t *ra_svn_commit(svn_ra
"a log message with pre-1.5 servers; "
"consider passing an empty one, or upgrading "
"the server"));
- }
+ }
else if (log_msg == NULL)
/* 1.5+ server. Set LOG_MSG to something, since the 'logmsg' argument
to the 'commit' protocol command is non-optional; on the server side,
- only REVPROP_TABLE will be used, and LOG_MSG will be ignored. The
+ only REVPROP_TABLE will be used, and LOG_MSG will be ignored. The
"svn:log" member of REVPROP_TABLE table is NULL, therefore the commit
will have a NULL log message (not just "", really NULL).
@@ -1359,7 +1359,7 @@ static svn_error_t *ra_svn_get_dir(svn_r
SVN_ERR(svn_ra_svn__write_word(conn, pool, SVN_RA_SVN_DIRENT_TIME));
if (dirent_fields & SVN_DIRENT_LAST_AUTHOR)
SVN_ERR(svn_ra_svn__write_word(conn, pool, SVN_RA_SVN_DIRENT_LAST_AUTHOR));
-
+
/* Always send the, nominally optional, want-iprops as "false" to
workaround a bug in svnserve 1.8.0-1.8.8 that causes the server
to see "true" if it is omitted. */
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/marshal.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/marshal.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/marshal.c Sat Feb 14 11:15:05 2015
@@ -592,7 +592,7 @@ svn_ra_svn__write_proplist(svn_ra_svn_co
if (props)
for (hi = apr_hash_first(pool, props); hi; hi = apr_hash_next(hi))
{
- apr_hash_this(hi, (const void **)&propname,
+ apr_hash_this(hi, (const void **)&propname,
(apr_ssize_t *)&len,
(void **)&propval);
@@ -972,7 +972,7 @@ static svn_error_t *read_string(svn_ra_s
/* Read string data directly into the string structure.
* Do it iteratively. */
- do
+ do
{
/* Determine length of chunk to read and re-alloc the buffer. */
readbuf_len
@@ -990,7 +990,7 @@ static svn_error_t *read_string(svn_ra_s
len -= readbuf_len;
}
while (len);
-
+
/* zero-terminate the string */
stringbuf->data[stringbuf->len] = '\0';
@@ -1093,7 +1093,7 @@ static svn_error_t *read_item(svn_ra_svn
item->u.list->elts = (char *)data;
item->u.list->pool = pool;
item->u.list->elt_size = sizeof(*data);
- item->u.list->nelts = 0;
+ item->u.list->nelts = 0;
item->u.list->nalloc = 4;
listitem = data;
@@ -1118,7 +1118,7 @@ static svn_error_t *read_item(svn_ra_svn
/* read next protocol item */
SVN_ERR(read_item(conn, pool, listitem, c, level));
- listitem++;
+ listitem++;
item->u.list->nelts++;
}
SVN_ERR(readbuf_getchar(conn, pool, &c));
@@ -2483,7 +2483,7 @@ svn_ra_svn__write_data_log_entry(svn_ra_
SVN_ERR(write_tuple_boolean(conn, pool, has_children));
SVN_ERR(write_tuple_boolean(conn, pool, invalid_revnum));
SVN_ERR(svn_ra_svn__write_number(conn, pool, revprop_count));
-
+
return SVN_NO_ERROR;
}
@@ -2504,7 +2504,7 @@ svn_ra_svn__read_string(const apr_array_
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;
-
+
return SVN_NO_ERROR;
}
@@ -2518,7 +2518,7 @@ svn_ra_svn__read_cstring(const apr_array
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;
-
+
return SVN_NO_ERROR;
}
@@ -2532,7 +2532,7 @@ svn_ra_svn__read_word(const apr_array_he
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;
-
+
return SVN_NO_ERROR;
}
@@ -2546,7 +2546,7 @@ svn_ra_svn__read_revision(const apr_arra
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;
-
+
return SVN_NO_ERROR;
}
@@ -2565,7 +2565,7 @@ svn_ra_svn__read_boolean(const apr_array
*result = FALSE;
else
CHECK_PROTOCOL_COND(FALSE);
-
+
return SVN_NO_ERROR;
}
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_repos/authz_pool.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_repos/authz_pool.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_repos/authz_pool.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_repos/authz_pool.c Sat Feb 14 11:15:05 2015
@@ -154,7 +154,7 @@ svn_repos__authz_pool_get(svn_authz_t **
authz_object_t *authz_ref
= apr_pcalloc(authz_ref_pool, sizeof(*authz_ref));
svn_boolean_t have_all_keys;
-
+
/* read the configurations */
SVN_ERR(svn_repos__config_pool_get(&authz_ref->authz_cfg,
&authz_ref->authz_key,
@@ -162,7 +162,7 @@ svn_repos__authz_pool_get(svn_authz_t **
path, must_exist, TRUE,
preferred_repos, authz_ref_pool));
have_all_keys = authz_ref->authz_key != NULL;
-
+
if (groups_path)
{
SVN_ERR(svn_repos__config_pool_get(&authz_ref->groups_cfg,
@@ -173,12 +173,12 @@ svn_repos__authz_pool_get(svn_authz_t **
have_all_keys &= authz_ref->groups_key != NULL;
}
- /* fall back to standard implementation in case we don't have all the
+ /* fall back to standard implementation in case we don't have all the
* facts (i.e. keys). */
if (!have_all_keys)
return svn_error_trace(svn_repos_authz_read2(authz_p, path, groups_path,
must_exist, pool));
-
+
/* all keys are known and lookup is unambigious. */
authz_ref->key = construct_key(authz_ref->authz_key,
authz_ref->groups_key,
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_repos/config_pool.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_repos/config_pool.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_repos/config_pool.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_repos/config_pool.c Sat Feb 14 11:15:05 2015
@@ -182,7 +182,7 @@ setter(void **target,
* CONFIG_POOL, yet, parse CONTENTS and cache the result. CASE_SENSITIVE
* controls option and section name matching.
*
- * RESULT_POOL determines the lifetime of the returned reference and
+ * RESULT_POOL determines the lifetime of the returned reference and
* SCRATCH_POOL is being used for temporary allocations.
*/
static svn_error_t *
@@ -283,12 +283,12 @@ add_checksum(svn_repos__config_pool_t *c
return SVN_NO_ERROR;
}
-/* Set *CFG to the configuration stored in URL@HEAD and cache it in
+/* Set *CFG to the configuration stored in URL@HEAD and cache it in
* CONFIG_POOL. CASE_SENSITIVE controls
* option and section name matching. If PREFERRED_REPOS is given,
* use that if it also matches URL.
- *
- * RESULT_POOL determines the lifetime of the returned reference and
+ *
+ * RESULT_POOL determines the lifetime of the returned reference and
* SCRATCH_POOL is being used for temporary allocations.
*/
static svn_error_t *
@@ -416,7 +416,7 @@ key_by_url(svn_membuf_t **key,
/* found *some* reference to a configuration.
* Verify that it is still current. Will fail for BDB repos. */
- err = svn_stringbuf_from_file2(&contents,
+ err = svn_stringbuf_from_file2(&contents,
svn_dirent_join(config->repo_root,
"db/current", pool),
pool);
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_repos/dump.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_repos/dump.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_repos/dump.c Sat Feb 14 11:15:05 2015
@@ -2323,11 +2323,11 @@ verify_one_revision(svn_fs_t *fs,
SVN_ERR(svn_repos_replay2(to_root, "", SVN_INVALID_REVNUM, FALSE,
cancel_editor, cancel_edit_baton,
NULL, NULL, scratch_pool));
-
+
/* While our editor close_edit implementation is a no-op, we still
do this for completeness. */
SVN_ERR(cancel_editor->close_edit(cancel_edit_baton, scratch_pool));
-
+
SVN_ERR(svn_fs_revision_proplist(&props, fs, rev, scratch_pool));
return SVN_NO_ERROR;
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_repos/fs-wrap.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_repos/fs-wrap.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_repos/fs-wrap.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_repos/fs-wrap.c Sat Feb 14 11:15:05 2015
@@ -104,7 +104,7 @@ svn_repos_fs_commit_txn(const char **con
svn_error_clear(svn_fs_change_txn_prop(txn, key, val, iterpool));
}
svn_pool_destroy(iterpool);
-
+
return err;
}
@@ -592,7 +592,7 @@ svn_repos_fs_lock_many(svn_repos_t *repo
if (!cb_err && lock_callback)
cb_err = lock_callback(lock_baton, path, NULL, err, iterpool);
svn_error_clear(err);
-
+
continue;
}
@@ -678,7 +678,7 @@ svn_repos_fs_lock(svn_lock_t **lock,
{
apr_hash_t *targets = apr_hash_make(pool);
svn_fs_lock_target_t *target = svn_fs_lock_target_create(token, current_rev,
- pool);
+ pool);
svn_error_t *err;
struct lock_baton_t baton = {0};
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_repos/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_repos/log.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_repos/log.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_repos/log.c Sat Feb 14 11:15:05 2015
@@ -2340,7 +2340,7 @@ svn_repos_get_logs4(svn_repos_t *repos,
revprops = new_revprops;
}
-
+
/* Setup log range. */
SVN_ERR(svn_fs_youngest_rev(&head, fs, pool));
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_subr/bit_array.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_subr/bit_array.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_subr/bit_array.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_subr/bit_array.c Sat Feb 14 11:15:05 2015
@@ -33,7 +33,7 @@
*/
#define BLOCK_SIZE 0x10000
-/* Number of bits in each block.
+/* Number of bits in each block.
*/
#define BLOCK_SIZE_BITS (8 * BLOCK_SIZE)
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_subr/cache-membuffer.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_subr/cache-membuffer.c Sat Feb 14 11:15:05 2015
@@ -333,7 +333,7 @@ static void get_prefix_tail(const char *
apr_size_t len = strlen(prefix);
apr_size_t to_copy = MIN(len, PREFIX_TAIL_LEN - 1);
const char *last_colon = strrchr(prefix, ':');
- apr_size_t last_element_pos = last_colon ? 0 : last_colon - prefix + 1;
+ apr_size_t last_element_pos = last_colon ? 0 : last_colon - prefix + 1;
to_copy = MIN(to_copy, len - last_element_pos);
memset(prefix_tail, 0, PREFIX_TAIL_LEN);
@@ -411,7 +411,7 @@ typedef struct group_header_t
/* number of elements in the chain from start to here.
* >= 1 for used groups, 0 for unused spare groups */
apr_uint32_t chain_length;
-
+
} group_header_t;
/* The size of the group struct should be a power of two make sure it does
@@ -439,7 +439,7 @@ typedef struct entry_group_t
{
/* group globals */
group_header_t header;
-
+
/* padding and also room for future extensions */
char padding[GROUP_BLOCK_SIZE - sizeof(group_header_t)
- sizeof(entry_t) * GROUP_SIZE];
@@ -971,11 +971,11 @@ unchain_entry(svn_membuffer_t *cache,
{
assert(idx == get_index(cache, entry));
- /* update
+ /* update
*/
if (level->next == idx)
level->next = entry->next;
-
+
/* unlink it from the chain of used entries
*/
if (entry->previous == NO_INDEX)
@@ -1375,12 +1375,12 @@ promote_entry(svn_membuffer_t *cache, en
}
/* This function implements the cache insertion / eviction strategy for L2.
- *
+ *
* If necessary, enlarge the insertion window of CACHE->L2 until it is at
* least TO_FIT_IN->SIZE bytes long. TO_FIT_IN->SIZE must not exceed the
* data buffer size allocated to CACHE->L2. IDX is the item index of
* TO_FIT_IN and is given for performance reasons.
- *
+ *
* Return TRUE if enough room could be found or made. A FALSE result
* indicates that the respective item shall not be added.
*/
@@ -1507,7 +1507,7 @@ ensure_data_insertable_l2(svn_membuffer_
* Count the "hit importance" such that we are not sacrificing
* too much of the high-hit contents. However, don't count
* low-priority hits because higher prio entries will often
- * provide the same data but in a further stage of processing.
+ * provide the same data but in a further stage of processing.
*/
if (entry->priority > SVN_CACHE__MEMBUFFER_LOW_PRIORITY)
drop_hits += entry->hit_count * (apr_uint64_t)entry->priority;
@@ -2495,7 +2495,7 @@ typedef struct svn_membuffer_cache_t
/* priority class for all items written through this interface */
apr_uint32_t priority;
-
+
/* Temporary buffer containing the hash key for the current access
*/
entry_key_t combined_key;
@@ -2504,7 +2504,7 @@ typedef struct svn_membuffer_cache_t
* Will be NULL for caches with short fix-sized keys.
*/
last_access_key_t *last_access;
-
+
/* if enabled, this will serialize the access to this instance.
*/
svn_mutex__t *mutex;
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_subr/config.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_subr/config.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_subr/config.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_subr/config.c Sat Feb 14 11:15:05 2015
@@ -741,7 +741,7 @@ svn_config_set(svn_config_t *cfg,
cfg_option_t *opt;
/* Ignore write attempts to r/o configurations.
- *
+ *
* Since we should never try to modify r/o data, trigger an assertion
* in debug mode.
*/
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_subr/dirent_uri.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_subr/dirent_uri.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_subr/dirent_uri.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_subr/dirent_uri.c Sat Feb 14 11:15:05 2015
@@ -1738,8 +1738,8 @@ relpath_is_canonical(const char *relpath
if (ptr[len-1] == '/' || (ptr[len-1] == '.' && ptr[len-2] == '/'))
return FALSE;
- /* '.' are rare. So, search for them globally. There will often be no
- * more than one hit. Also note that we already checked for invalid
+ /* '.' are rare. So, search for them globally. There will often be no
+ * more than one hit. Also note that we already checked for invalid
* starts and endings, i.e. we only need to check for "/./"
*/
for (dot_pos = memchr(ptr, '.', len);
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_subr/dso.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_subr/dso.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_subr/dso.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_subr/dso.c Sat Feb 14 11:15:05 2015
@@ -50,12 +50,10 @@ static volatile svn_atomic_t atomic_init
there. */
#define NOT_THERE ((void *) ¬_there_sentinel)
-svn_error_t *
-svn_dso_initialize2(void)
+static svn_error_t *
+atomic_init_func(void *baton,
+ apr_pool_t *pool)
{
- if (dso_pool)
- return SVN_NO_ERROR;
-
dso_pool = svn_pool_create(NULL);
SVN_ERR(svn_mutex__init(&dso_mutex, TRUE, dso_pool));
@@ -64,11 +62,12 @@ svn_dso_initialize2(void)
return SVN_NO_ERROR;
}
-static svn_error_t *
-atomic_init_func(void *baton,
- apr_pool_t *pool)
+svn_error_t *
+svn_dso_initialize2(void)
{
- SVN_ERR(svn_dso_initialize2());
+ SVN_ERR(svn_atomic__init_once(&atomic_init_status, atomic_init_func,
+ NULL, NULL));
+
return SVN_NO_ERROR;
}
@@ -118,8 +117,7 @@ svn_dso_load_internal(apr_dso_handle_t *
svn_error_t *
svn_dso_load(apr_dso_handle_t **dso, const char *fname)
{
- SVN_ERR(svn_atomic__init_once(&atomic_init_status, atomic_init_func,
- NULL, NULL));
+ SVN_ERR(svn_dso_initialize2());
SVN_MUTEX__WITH_LOCK(dso_mutex, svn_dso_load_internal(dso, fname));
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_subr/fnv1a.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_subr/fnv1a.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_subr/fnv1a.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_subr/fnv1a.c Sat Feb 14 11:15:05 2015
@@ -34,7 +34,7 @@
*/
/* FNV-1 32 bit constants taken from
- * http://www.isthe.com/chongo/tech/comp/fnv/
+ * http://www.isthe.com/chongo/tech/comp/fnv/
*/
#define FNV1_PRIME_32 0x01000193
#define FNV1_BASE_32 2166136261U
@@ -47,7 +47,7 @@ fnv1a_32(apr_uint32_t hash, const void *
{
const unsigned char *data = input;
const unsigned char *end = data + len;
-
+
for (; data != end; ++data)
{
hash ^= *data;
@@ -142,7 +142,7 @@ svn_fnv1a_32__context_create(apr_pool_t
{
svn_fnv1a_32__context_t *context = apr_palloc(pool, sizeof(*context));
context->hash = FNV1_BASE_32;
-
+
return context;
}
@@ -203,7 +203,7 @@ svn_fnv1a_32x4__update(svn_fnv1a_32x4__c
memcpy(context->buffer + context->buffered, data, to_copy);
data = (const char *)data + to_copy;
len -= to_copy;
-
+
fnv1a_32x4(context->hashes, context->buffer, SCALING);
context->buffered = 0;
}
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_subr/gpg_agent.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_subr/gpg_agent.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_subr/gpg_agent.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_subr/gpg_agent.c Sat Feb 14 11:15:05 2015
@@ -209,7 +209,7 @@ find_running_gpg_agent(int *new_sd, apr_
/* This implements the method of finding the socket as described in
* the gpg-agent man page under the --use-standard-socket option.
- * The manage page misleadingly says the standard socket is
+ * The manage page misleadingly says the standard socket is
* "named 'S.gpg-agent' located in the home directory." The standard
* socket path is actually in the .gnupg directory in the home directory,
* i.e. ~/.gnupg/S.gpg-agent */
@@ -219,7 +219,7 @@ find_running_gpg_agent(int *new_sd, apr_
apr_array_header_t *socket_details;
/* For reference GPG_AGENT_INFO consists of 3 : separated fields.
- * The path to the socket, the pid of the gpg-agent process and
+ * The path to the socket, the pid of the gpg-agent process and
* finally the version of the protocol the agent talks. */
socket_details = svn_cstring_split(gpg_agent_info, ":", TRUE,
pool);
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_subr/hash.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_subr/hash.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_subr/hash.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_subr/hash.c Sat Feb 14 11:15:05 2015
@@ -597,14 +597,14 @@ svn_hash__get_bool(apr_hash_t *hash, con
/*** Optimized hash function ***/
-/* apr_hashfunc_t optimized for the key that we use in SVN: paths and
+/* apr_hashfunc_t optimized for the key that we use in SVN: paths and
* property names. Its primary goal is speed for keys of known length.
- *
+ *
* Since strings tend to spawn large value spaces (usually differ in many
* bits with differences spanning a larger section of the key), we can be
* quite sloppy extracting a hash value. The more keys there are in a
* hash container, the more bits of the value returned by this function
- * will be used. For a small number of string keys, choosing bits from any
+ * will be used. For a small number of string keys, choosing bits from any
* any fix location close to the tail of those keys would usually be good
* enough to prevent high collision rates.
*/
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_subr/io.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_subr/io.c Sat Feb 14 11:15:05 2015
@@ -2387,7 +2387,7 @@ stringbuf_from_aprfile(svn_stringbuf_t *
res_initial_len, &res->len,
&eof, pool));
res->data[res->len] = 0;
-
+
*result = res;
return SVN_NO_ERROR;
}
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_subr/object_pool.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_subr/object_pool.c?rev=1659777&r1=1659776&r2=1659777&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_subr/object_pool.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_subr/object_pool.c Sat Feb 14 11:15:05 2015
@@ -85,7 +85,7 @@ struct svn_object_pool__t
/* the root pool owning this structure */
apr_pool_t *pool;
-
+
/* extractor and updater for the user object wrappers */
svn_object_pool__getter_t getter;
svn_object_pool__setter_t setter;
@@ -171,7 +171,7 @@ static void
add_object_ref(object_ref_t *object_ref,
apr_pool_t *pool)
{
- /* Update ref counter.
+ /* Update ref counter.
Note that this is racy with object_ref_cleanup; see comment there. */
if (svn_atomic_inc(&object_ref->ref_count) == 0)
svn_atomic_dec(&object_ref->object_pool->unused_count);
@@ -275,7 +275,7 @@ insert(void **object,
svn_atomic_inc(&object_pool->object_count);
/* the new entry is *not* in use yet.
- * add_object_ref will update counters again.
+ * add_object_ref will update counters again.
*/
svn_atomic_inc(&object_ref->object_pool->unused_count);
}
@@ -345,7 +345,7 @@ svn_object_pool__create(svn_object_pool_
*/
apr_pool_cleanup_register(pool, result, object_pool_cleanup,
apr_pool_cleanup_null);
-
+
*object_pool = result;
return SVN_NO_ERROR;
}