You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/09/25 12:22:33 UTC
svn commit: r1627498 - in /subversion/trunk: subversion/libsvn_fs_fs/index.c
subversion/libsvn_fs_x/index.c tools/dev/fsfs-access-map.c
Author: stefan2
Date: Thu Sep 25 10:22:33 2014
New Revision: 1627498
URL: http://svn.apache.org/r1627498
Log:
As per convention, iteration pools shall be named "iterpool".
* subversion/libsvn_fs_fs/index.c
(svn_fs_fs__p2l_index_append): s/iter_pool/iterpool/g.
* subversion/libsvn_fs_x/index.c
(svn_fs_x__p2l_index_create): Same.
* tools/dev/fsfs-access-map.c
(parse_file): Same.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/index.c
subversion/trunk/subversion/libsvn_fs_x/index.c
subversion/trunk/tools/dev/fsfs-access-map.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/index.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/index.c?rev=1627498&r1=1627497&r2=1627498&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/index.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/index.c Thu Sep 25 10:22:33 2014
@@ -1675,7 +1675,7 @@ svn_fs_fs__p2l_index_append(svn_fs_t *fs
= svn_spillbuf__create(0x10000, 0x1000000, local_pool);
/* for loop temps ... */
- apr_pool_t *iter_pool = svn_pool_create(scratch_pool);
+ apr_pool_t *iterpool = svn_pool_create(scratch_pool);
/* start at the beginning of the source file */
SVN_ERR(svn_io_file_open(&proto_index, proto_file_name,
@@ -1692,11 +1692,11 @@ svn_fs_fs__p2l_index_append(svn_fs_t *fs
apr_uint64_t compound;
apr_int64_t rev_diff, compound_diff;
- svn_pool_clear(iter_pool);
+ svn_pool_clear(iterpool);
/* (attempt to) read the next entry from the source */
SVN_ERR(svn_io_file_read_full2(proto_index, &entry, sizeof(entry),
- &read, &eof, iter_pool));
+ &read, &eof, iterpool));
SVN_ERR_ASSERT(eof || read == sizeof(entry));
/* "unused" (and usually non-existent) section to cover the offsets
@@ -1738,7 +1738,7 @@ svn_fs_fs__p2l_index_append(svn_fs_t *fs
{
SVN_ERR(svn_spillbuf__write(buffer, (const char *)encoded,
encode_uint(encoded, entry.offset),
- iter_pool));
+ iterpool));
last_revision = revision;
last_compound = 0;
}
@@ -1746,7 +1746,7 @@ svn_fs_fs__p2l_index_append(svn_fs_t *fs
/* write simple item entry */
SVN_ERR(svn_spillbuf__write(buffer, (const char *)encoded,
encode_uint(encoded, entry.size),
- iter_pool));
+ iterpool));
rev_diff = entry.item.revision - last_revision;
last_revision = entry.item.revision;
@@ -1757,13 +1757,13 @@ svn_fs_fs__p2l_index_append(svn_fs_t *fs
SVN_ERR(svn_spillbuf__write(buffer, (const char *)encoded,
encode_int(encoded, compound_diff),
- iter_pool));
+ iterpool));
SVN_ERR(svn_spillbuf__write(buffer, (const char *)encoded,
encode_int(encoded, rev_diff),
- iter_pool));
+ iterpool));
SVN_ERR(svn_spillbuf__write(buffer, (const char *)encoded,
encode_uint(encoded, entry.fnv1_checksum),
- iter_pool));
+ iterpool));
last_entry_end = entry_end;
}
@@ -1804,7 +1804,7 @@ svn_fs_fs__p2l_index_append(svn_fs_t *fs
local_pool),
NULL, NULL, local_pool));
- svn_pool_destroy(iter_pool);
+ svn_pool_destroy(iterpool);
svn_pool_destroy(local_pool);
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_fs_x/index.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/index.c?rev=1627498&r1=1627497&r2=1627498&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/index.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/index.c Thu Sep 25 10:22:33 2014
@@ -1843,7 +1843,7 @@ svn_fs_x__p2l_index_create(svn_fs_t *fs,
= svn_spillbuf__create(0x10000, 0x1000000, local_pool);
/* for loop temps ... */
- apr_pool_t *iter_pool = svn_pool_create(pool);
+ apr_pool_t *iterpool = svn_pool_create(pool);
/* start at the beginning of the source file */
SVN_ERR(svn_io_file_open(&proto_index, proto_file_name,
@@ -1861,20 +1861,20 @@ svn_fs_x__p2l_index_create(svn_fs_t *fs,
svn_revnum_t last_revision = revision;
apr_uint64_t last_number = 0;
- svn_pool_clear(iter_pool);
+ svn_pool_clear(iterpool);
/* (attempt to) read the next entry from the source */
SVN_ERR(svn_io_file_read_full2(proto_index, &entry, sizeof(entry),
- &read, &eof, iter_pool));
+ &read, &eof, iterpool));
SVN_ERR_ASSERT(eof || read == sizeof(entry));
if (entry.item_count && !eof)
{
to_read = entry.item_count * sizeof(*entry.items);
- entry.items = apr_palloc(iter_pool, to_read);
+ entry.items = apr_palloc(iterpool, to_read);
SVN_ERR(svn_io_file_read_full2(proto_index, entry.items, to_read,
- &read, &eof, iter_pool));
+ &read, &eof, iterpool));
SVN_ERR_ASSERT(eof || read == to_read);
}
@@ -1884,7 +1884,7 @@ svn_fs_x__p2l_index_create(svn_fs_t *fs,
apr_size_t entry_size;
to_read = sizeof(entry_size);
SVN_ERR(svn_io_file_read_full2(proto_index, &entry_size, to_read,
- &read, &eof, iter_pool));
+ &read, &eof, iterpool));
SVN_ERR_ASSERT(eof || read == to_read);
}
@@ -1925,20 +1925,20 @@ svn_fs_x__p2l_index_create(svn_fs_t *fs,
{
SVN_ERR(svn_spillbuf__write(buffer, (const char *)encoded,
encode_uint(encoded, entry.offset),
- iter_pool));
+ iterpool));
last_revision = revision;
}
/* write simple item / container entry */
SVN_ERR(svn_spillbuf__write(buffer, (const char *)encoded,
encode_uint(encoded, entry.size),
- iter_pool));
+ iterpool));
SVN_ERR(svn_spillbuf__write(buffer, (const char *)encoded,
encode_uint(encoded, entry.type + entry.item_count * 16),
- iter_pool));
+ iterpool));
SVN_ERR(svn_spillbuf__write(buffer, (const char *)encoded,
encode_uint(encoded, entry.fnv1_checksum),
- iter_pool));
+ iterpool));
/* container contents (only one for non-container items) */
for (sub_item = 0; sub_item < entry.item_count; ++sub_item)
@@ -1948,7 +1948,7 @@ svn_fs_x__p2l_index_create(svn_fs_t *fs,
apr_int64_t diff = item_rev - last_revision;
SVN_ERR(svn_spillbuf__write(buffer, (const char *)encoded,
encode_int(encoded, diff),
- iter_pool));
+ iterpool));
last_revision = item_rev;
}
@@ -1957,7 +1957,7 @@ svn_fs_x__p2l_index_create(svn_fs_t *fs,
apr_int64_t diff = entry.items[sub_item].number - last_number;
SVN_ERR(svn_spillbuf__write(buffer, (const char *)encoded,
encode_int(encoded, diff),
- iter_pool));
+ iterpool));
last_number = entry.items[sub_item].number;
}
@@ -2007,7 +2007,7 @@ svn_fs_x__p2l_index_create(svn_fs_t *fs,
SVN_ERR(svn_io_file_close(index_file, local_pool));
SVN_ERR(svn_io_set_file_read_only(file_name, FALSE, local_pool));
- svn_pool_destroy(iter_pool);
+ svn_pool_destroy(iterpool);
svn_pool_destroy(local_pool);
return SVN_NO_ERROR;
Modified: subversion/trunk/tools/dev/fsfs-access-map.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/fsfs-access-map.c?rev=1627498&r1=1627497&r2=1627498&view=diff
==============================================================================
--- subversion/trunk/tools/dev/fsfs-access-map.c (original)
+++ subversion/trunk/tools/dev/fsfs-access-map.c Thu Sep 25 10:22:33 2014
@@ -353,7 +353,7 @@ static void
parse_file(apr_file_t *file)
{
apr_pool_t *pool = svn_pool_create(NULL);
- apr_pool_t *iter_pool = svn_pool_create(pool);
+ apr_pool_t *iterpool = svn_pool_create(pool);
/* limit lines to 4k (usually, we need less than 200 bytes) */
svn_stringbuf_t *line = svn_stringbuf_create_ensure(4096, pool);
@@ -363,13 +363,13 @@ parse_file(apr_file_t *file)
svn_error_t *err = NULL;
line->len = line->blocksize-1;
- err = svn_io_read_length_line(file, line->data, &line->len, iter_pool);
+ err = svn_io_read_length_line(file, line->data, &line->len, iterpool);
svn_error_clear(err);
if (err)
break;
parse_line(line);
- svn_pool_clear(iter_pool);
+ svn_pool_clear(iterpool);
}
while (line->len > 0);
}