Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 999C51020F for ; Fri, 2 Jan 2015 15:12:05 +0000 (UTC) Received: (qmail 20539 invoked by uid 500); 2 Jan 2015 15:12:06 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 20509 invoked by uid 500); 2 Jan 2015 15:12:06 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 20498 invoked by uid 99); 2 Jan 2015 15:12:06 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jan 2015 15:12:06 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 00C58AC08CC; Fri, 2 Jan 2015 15:12:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1649062 - in /subversion/trunk/subversion/libsvn_fs_x: cached_data.c cached_data.h dag.c dag.h fs.h temp_serializer.c temp_serializer.h transaction.c tree.c Date: Fri, 02 Jan 2015 15:12:05 -0000 To: commits@subversion.apache.org From: stefan2@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150102151206.00C58AC08CC@hades.apache.org> Author: stefan2 Date: Fri Jan 2 15:12:05 2015 New Revision: 1649062 URL: http://svn.apache.org/r1649062 Log: In FSX, continue renaming global structs to meet our coding guidelines. This is part of a series of search-replace changes. * subversion/libsvn_fs_x/fs.h (svn_fs_x__data_t): Update docstring. (dirent_t): Rename to ... (svn_fs_x__dirent_t): ... this. * subversion/libsvn_fs_x/cached_data.c * subversion/libsvn_fs_x/cached_data.h * subversion/libsvn_fs_x/dag.c * subversion/libsvn_fs_x/dag.h * subversion/libsvn_fs_x/temp_serializer.c * subversion/libsvn_fs_x/temp_serializer.h * subversion/libsvn_fs_x/transaction.c * subversion/libsvn_fs_x/tree.c (): s/dirent_t/svn_fs_x__dirent_t/g Modified: subversion/trunk/subversion/libsvn_fs_x/cached_data.c subversion/trunk/subversion/libsvn_fs_x/cached_data.h subversion/trunk/subversion/libsvn_fs_x/dag.c subversion/trunk/subversion/libsvn_fs_x/dag.h subversion/trunk/subversion/libsvn_fs_x/fs.h subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h subversion/trunk/subversion/libsvn_fs_x/transaction.c subversion/trunk/subversion/libsvn_fs_x/tree.c Modified: subversion/trunk/subversion/libsvn_fs_x/cached_data.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/cached_data.c?rev=1649062&r1=1649061&r2=1649062&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_x/cached_data.c (original) +++ subversion/trunk/subversion/libsvn_fs_x/cached_data.c Fri Jan 2 15:12:05 2015 @@ -2388,14 +2388,14 @@ svn_fs_x__get_file_delta_stream(svn_txde return SVN_NO_ERROR; } -/* Return TRUE when all dirent_t* in ENTRIES are already sorted +/* Return TRUE when all svn_fs_x__dirent_t* in ENTRIES are already sorted by their respective name. */ static svn_boolean_t sorted(apr_array_header_t *entries) { int i; - const dirent_t * const *dirents = (const void *)entries->elts; + const svn_fs_x__dirent_t * const *dirents = (const void *)entries->elts; for (i = 0; i < entries->nelts-1; ++i) if (strcmp(dirents[i]->name, dirents[i+1]->name) > 0) return FALSE; @@ -2407,8 +2407,8 @@ sorted(apr_array_header_t *entries) static int compare_dirents(const void *a, const void *b) { - const dirent_t *lhs = *((const dirent_t * const *) a); - const dirent_t *rhs = *((const dirent_t * const *) b); + const svn_fs_x__dirent_t *lhs = *((const svn_fs_x__dirent_t * const *) a); + const svn_fs_x__dirent_t *rhs = *((const svn_fs_x__dirent_t * const *) b); return strcmp(lhs->name, rhs->name); } @@ -2417,7 +2417,7 @@ compare_dirents(const void *a, const voi static int compare_dirent_name(const void *a, const void *b) { - const dirent_t *lhs = *((const dirent_t * const *) a); + const svn_fs_x__dirent_t *lhs = *((const svn_fs_x__dirent_t * const *) a); const char *rhs = b; return strcmp(lhs->name, rhs); @@ -2445,7 +2445,7 @@ read_dir_entries(apr_array_header_t *ent while (1) { svn_hash__entry_t entry; - dirent_t *dirent; + svn_fs_x__dirent_t *dirent; char *str; svn_pool_clear(iterpool); @@ -2510,7 +2510,7 @@ read_dir_entries(apr_array_header_t *ent if (incremental) apr_hash_set(hash, entry.key, entry.keylen, dirent); else - APR_ARRAY_PUSH(entries, dirent_t *) = dirent; + APR_ARRAY_PUSH(entries, svn_fs_x__dirent_t *) = dirent; } /* Convert container to a sorted array. */ @@ -2518,7 +2518,7 @@ read_dir_entries(apr_array_header_t *ent { apr_hash_index_t *hi; for (hi = apr_hash_first(iterpool, hash); hi; hi = apr_hash_next(hi)) - APR_ARRAY_PUSH(entries, dirent_t *) = apr_hash_this_val(hi); + APR_ARRAY_PUSH(entries, svn_fs_x__dirent_t *) = apr_hash_this_val(hi); } if (!sorted(entries)) @@ -2531,7 +2531,7 @@ read_dir_entries(apr_array_header_t *ent /* Fetch the contents of a directory into ENTRIES. Values are stored as filename to string mappings; further conversion is necessary to - convert them into dirent_t values. */ + convert them into svn_fs_x__dirent_t values. */ static svn_error_t * get_dir_contents(apr_array_header_t **entries, svn_fs_t *fs, @@ -2542,7 +2542,7 @@ get_dir_contents(apr_array_header_t **en svn_stream_t *contents; const svn_fs_x__id_t *id = &noderev->noderev_id; - *entries = apr_array_make(result_pool, 16, sizeof(dirent_t *)); + *entries = apr_array_make(result_pool, 16, sizeof(svn_fs_x__dirent_t *)); if (noderev->data_rep && ! svn_fs_x__is_revision(noderev->data_rep->id.change_set)) { @@ -2649,18 +2649,18 @@ svn_fs_x__rep_contents_dir(apr_array_hea return SVN_NO_ERROR; } -dirent_t * +svn_fs_x__dirent_t * svn_fs_x__find_dir_entry(apr_array_header_t *entries, const char *name, int *hint) { - dirent_t **result + svn_fs_x__dirent_t **result = svn_sort__array_lookup(entries, name, hint, compare_dirent_name); return result ? *result : NULL; } svn_error_t * -svn_fs_x__rep_contents_dir_entry(dirent_t **dirent, +svn_fs_x__rep_contents_dir_entry(svn_fs_x__dirent_t **dirent, svn_fs_t *fs, svn_fs_x__noderev_t *noderev, const char *name, @@ -2688,8 +2688,8 @@ svn_fs_x__rep_contents_dir_entry(dirent_ if (! found) { apr_array_header_t *entries; - dirent_t *entry; - dirent_t *entry_copy = NULL; + svn_fs_x__dirent_t *entry; + svn_fs_x__dirent_t *entry_copy = NULL; /* read the dir from the file system. It will probably be put it into the cache for faster lookup in future calls. */ Modified: subversion/trunk/subversion/libsvn_fs_x/cached_data.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/cached_data.h?rev=1649062&r1=1649061&r2=1649062&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_x/cached_data.h (original) +++ subversion/trunk/subversion/libsvn_fs_x/cached_data.h Fri Jan 2 15:12:05 2015 @@ -139,7 +139,7 @@ svn_fs_x__rep_contents_dir(apr_array_hea entry exists, return NULL. If HINT is not NULL, set *HINT to the array index of the entry returned. Successive calls in a linear scan scenario will be faster called with the same HINT variable. */ -dirent_t * +svn_fs_x__dirent_t * svn_fs_x__find_dir_entry(apr_array_header_t *entries, const char *name, int *hint); @@ -149,7 +149,7 @@ svn_fs_x__find_dir_entry(apr_array_heade be NULL. The returned object is allocated in RESULT_POOL; SCRATCH_POOL used for temporary allocations. */ svn_error_t * -svn_fs_x__rep_contents_dir_entry(dirent_t **dirent, +svn_fs_x__rep_contents_dir_entry(svn_fs_x__dirent_t **dirent, svn_fs_t *fs, svn_fs_x__noderev_t *noderev, const char *name, Modified: subversion/trunk/subversion/libsvn_fs_x/dag.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag.c?rev=1649062&r1=1649061&r2=1649062&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_x/dag.c (original) +++ subversion/trunk/subversion/libsvn_fs_x/dag.c Fri Jan 2 15:12:05 2015 @@ -361,7 +361,7 @@ dir_entry_id_from_node(svn_fs_x__id_t *i const char *name, apr_pool_t *scratch_pool) { - dirent_t *dirent; + svn_fs_x__dirent_t *dirent; SVN_ERR(svn_fs_x__dag_dir_entry(&dirent, parent, name, scratch_pool, scratch_pool)); @@ -483,7 +483,7 @@ svn_fs_x__dag_dir_entries(apr_array_head } svn_error_t * -svn_fs_x__dag_dir_entry(dirent_t **dirent, +svn_fs_x__dag_dir_entry(svn_fs_x__dirent_t **dirent, dag_node_t *node, const char* name, apr_pool_t *result_pool, @@ -813,7 +813,7 @@ svn_fs_x__dag_delete(dag_node_t *parent, { svn_fs_x__noderev_t *parent_noderev; svn_fs_t *fs = parent->fs; - dirent_t *dirent; + svn_fs_x__dirent_t *dirent; apr_pool_t *subpool; /* Make sure parent is a directory. */ @@ -888,7 +888,7 @@ svn_fs_x__dag_delete_if_mutable(svn_fs_t for (i = 0; i < entries->nelts; ++i) { const svn_fs_x__id_t *noderev_id - = &APR_ARRAY_IDX(entries, i, dirent_t *)->id; + = &APR_ARRAY_IDX(entries, i, svn_fs_x__dirent_t *)->id; svn_pool_clear(iterpool); SVN_ERR(svn_fs_x__dag_delete_if_mutable(fs, noderev_id, pool)); Modified: subversion/trunk/subversion/libsvn_fs_x/dag.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag.h?rev=1649062&r1=1649061&r2=1649062&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_x/dag.h (original) +++ subversion/trunk/subversion/libsvn_fs_x/dag.h Fri Jan 2 15:12:05 2015 @@ -294,7 +294,7 @@ svn_fs_x__dag_open(dag_node_t **child_p, /* Set *ENTRIES_P to an array of NODE's entries, sorted by entry names, - and the values are dirent_t's. The returned table (and elements) + and the values are svn_fs_x__dirent_t's. The returned table (and elements) is allocated in POOL, which is also used for temporary allocations. */ svn_error_t *svn_fs_x__dag_dir_entries(apr_array_header_t **entries_p, dag_node_t *node, @@ -307,7 +307,7 @@ svn_error_t *svn_fs_x__dag_dir_entries(a Otherwise, the *DIRENT will be set to NULL. */ /* ### This function is currently only called from dag.c. */ -svn_error_t * svn_fs_x__dag_dir_entry(dirent_t **dirent, +svn_error_t * svn_fs_x__dag_dir_entry(svn_fs_x__dirent_t **dirent, dag_node_t *node, const char* name, apr_pool_t *result_pool, Modified: subversion/trunk/subversion/libsvn_fs_x/fs.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.h?rev=1649062&r1=1649061&r2=1649062&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_x/fs.h (original) +++ subversion/trunk/subversion/libsvn_fs_x/fs.h Fri Jan 2 15:12:05 2015 @@ -288,7 +288,7 @@ typedef struct svn_fs_x__data_t /* A cache of the contents of immutable directories; maps from unparsed FS ID to a apr_hash_t * mapping (const char *) dirent - names to (dirent_t *). */ + names to (svn_fs_x__dirent_t *). */ svn_cache__t *dir_cache; /* Fulltext cache; currently only used with memcached. Maps from @@ -529,7 +529,7 @@ typedef struct svn_fs_x__noderev_t /** The type of a directory entry. */ -typedef struct dirent_t +typedef struct svn_fs_x__dirent_t { /** The name of this directory entry. */ @@ -540,7 +540,7 @@ typedef struct dirent_t /** The node kind. */ svn_node_kind_t kind; -} dirent_t; +} svn_fs_x__dirent_t; /*** Change ***/ Modified: subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c?rev=1649062&r1=1649061&r2=1649062&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c (original) +++ subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c Fri Jan 2 15:12:05 2015 @@ -203,7 +203,7 @@ typedef struct dir_data_t apr_size_t len; /* reference to the entries */ - dirent_t **entries; + svn_fs_x__dirent_t **entries; /* size of the serialized entries and don't be too wasteful * (needed since the entries are no longer in sequence) */ @@ -216,15 +216,15 @@ typedef struct dir_data_t */ static void serialize_dir_entry(svn_temp_serializer__context_t *context, - dirent_t **entry_p, + svn_fs_x__dirent_t **entry_p, apr_uint32_t *length) { - dirent_t *entry = *entry_p; + svn_fs_x__dirent_t *entry = *entry_p; apr_size_t initial_length = svn_temp_serializer__get_length(context); svn_temp_serializer__push(context, (const void * const *)entry_p, - sizeof(dirent_t)); + sizeof(svn_fs_x__dirent_t)); svn_temp_serializer__add_string(context, &entry->name); @@ -247,7 +247,7 @@ serialize_dir(apr_array_header_t *entrie /* calculate sizes */ int count = entries->nelts; apr_size_t over_provision = 2 + count / 4; - apr_size_t entries_len = (count + over_provision) * sizeof(dirent_t*); + apr_size_t entries_len = (count + over_provision) * sizeof(svn_fs_x__dirent_t*); apr_size_t lengths_len = (count + over_provision) * sizeof(apr_uint32_t); /* copy the hash entries to an auxiliary struct of known layout */ @@ -258,7 +258,7 @@ serialize_dir(apr_array_header_t *entrie dir_data.lengths = apr_palloc(pool, lengths_len); for (i = 0; i < count; ++i) - dir_data.entries[i] = APR_ARRAY_IDX(entries, i, dirent_t *); + dir_data.entries[i] = APR_ARRAY_IDX(entries, i, svn_fs_x__dirent_t *); /* Serialize that aux. structure into a new one. Also, provide a good * estimate for the size of the buffer that we will need. */ @@ -295,11 +295,11 @@ static apr_array_header_t * deserialize_dir(void *buffer, dir_data_t *dir_data, apr_pool_t *pool) { apr_array_header_t *result - = apr_array_make(pool, dir_data->count, sizeof(dirent_t *)); + = apr_array_make(pool, dir_data->count, sizeof(svn_fs_x__dirent_t *)); apr_size_t i; apr_size_t count; - dirent_t *entry; - dirent_t **entries; + svn_fs_x__dirent_t *entry; + svn_fs_x__dirent_t **entries; /* resolve the reference to the entries array */ svn_temp_deserializer__resolve(buffer, (void **)&dir_data->entries); @@ -315,7 +315,7 @@ deserialize_dir(void *buffer, dir_data_t svn_temp_deserializer__resolve(entry, (void **)&entry->name); /* add the entry to the hash */ - APR_ARRAY_PUSH(result, dirent_t *) = entry; + APR_ARRAY_PUSH(result, svn_fs_x__dirent_t *) = entry; } /* return the now complete hash */ @@ -751,7 +751,7 @@ svn_fs_x__get_sharded_offset(void **out, * the number of valid entries in ENTRIES. */ static apr_size_t -find_entry(dirent_t **entries, +find_entry(svn_fs_x__dirent_t **entries, const char *name, apr_size_t count, svn_boolean_t *found) @@ -763,7 +763,7 @@ find_entry(dirent_t **entries, for (middle = upper / 2; lower < upper; middle = (upper + lower) / 2) { - const dirent_t *entry = + const svn_fs_x__dirent_t *entry = svn_temp_deserializer__ptr(entries, (const void *const *)&entries[middle]); const char* entry_name = svn_temp_deserializer__ptr(entry, (const void *const *)&entry->name); @@ -779,7 +779,7 @@ find_entry(dirent_t **entries, *found = FALSE; if (lower < count) { - const dirent_t *entry = + const svn_fs_x__dirent_t *entry = svn_temp_deserializer__ptr(entries, (const void *const *)&entries[lower]); const char* entry_name = svn_temp_deserializer__ptr(entry, (const void *const *)&entry->name); @@ -803,7 +803,7 @@ svn_fs_x__extract_dir_entry(void **out, svn_boolean_t found; /* resolve the reference to the entries array */ - const dirent_t * const *entries = + const svn_fs_x__dirent_t * const *entries = svn_temp_deserializer__ptr(data, (const void *const *)&dir_data->entries); /* resolve the reference to the lengths array */ @@ -811,7 +811,7 @@ svn_fs_x__extract_dir_entry(void **out, svn_temp_deserializer__ptr(data, (const void *const *)&dir_data->lengths); /* binary search for the desired entry by name */ - apr_size_t pos = find_entry((dirent_t **)entries, + apr_size_t pos = find_entry((svn_fs_x__dirent_t **)entries, name, dir_data->count, &found); @@ -820,7 +820,7 @@ svn_fs_x__extract_dir_entry(void **out, *out = NULL; if (found) { - const dirent_t *source = + const svn_fs_x__dirent_t *source = svn_temp_deserializer__ptr(entries, (const void *const *)&entries[pos]); /* Entries have been serialized one-by-one, each time including all @@ -831,11 +831,11 @@ svn_fs_x__extract_dir_entry(void **out, apr_size_t size = lengths[pos]; /* copy & deserialize the entry */ - dirent_t *new_entry = apr_palloc(pool, size); + svn_fs_x__dirent_t *new_entry = apr_palloc(pool, size); memcpy(new_entry, source, size); svn_temp_deserializer__resolve(new_entry, (void **)&new_entry->name); - *(dirent_t **)out = new_entry; + *(svn_fs_x__dirent_t **)out = new_entry; } return SVN_NO_ERROR; @@ -854,7 +854,7 @@ slowly_replace_dir_entry(void **data, dir_data_t *dir_data = (dir_data_t *)*data; apr_array_header_t *dir; int idx = -1; - dirent_t *entry; + svn_fs_x__dirent_t *entry; SVN_ERR(svn_fs_x__deserialize_dir_entries((void **)&dir, *data, @@ -868,7 +868,7 @@ slowly_replace_dir_entry(void **data, { /* Replace ENTRY with / insert the NEW_ENTRY */ if (entry) - APR_ARRAY_IDX(dir, idx, dirent_t *) = replace_baton->new_entry; + APR_ARRAY_IDX(dir, idx, svn_fs_x__dirent_t *) = replace_baton->new_entry; else svn_sort__array_insert(dir, &replace_baton->new_entry, idx); } @@ -891,7 +891,7 @@ svn_fs_x__replace_dir_entry(void **data, replace_baton_t *replace_baton = (replace_baton_t *)baton; dir_data_t *dir_data = (dir_data_t *)*data; svn_boolean_t found; - dirent_t **entries; + svn_fs_x__dirent_t **entries; apr_uint32_t *lengths; apr_uint32_t length; apr_size_t pos; @@ -905,7 +905,7 @@ svn_fs_x__replace_dir_entry(void **data, return slowly_replace_dir_entry(data, data_len, baton, pool); /* resolve the reference to the entries array */ - entries = (dirent_t **) + entries = (svn_fs_x__dirent_t **) svn_temp_deserializer__ptr((const char *)dir_data, (const void *const *)&dir_data->entries); Modified: subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h?rev=1649062&r1=1649061&r2=1649062&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h (original) +++ subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h Fri Jan 2 15:12:05 2015 @@ -195,7 +195,7 @@ svn_fs_x__get_sharded_offset(void **out, /** * Implements #svn_cache__partial_getter_func_t for a single - * #dirent_t within a serialized directory contents hash, + * #svn_fs_x__dirent_t within a serialized directory contents hash, * identified by its name (const char @a *baton). */ svn_error_t * @@ -217,12 +217,12 @@ typedef struct replace_baton_t const char *name; /** directory entry to insert instead */ - dirent_t *new_entry; + svn_fs_x__dirent_t *new_entry; } replace_baton_t; /** * Implements #svn_cache__partial_setter_func_t for a single - * #dirent_t within a serialized directory contents hash, + * #svn_fs_x__dirent_t within a serialized directory contents hash, * identified by its name in the #replace_baton_t in @a baton. */ svn_error_t * Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1649062&r1=1649061&r2=1649062&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original) +++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Fri Jan 2 15:12:05 2015 @@ -817,7 +817,7 @@ store_sha1_rep_mapping(svn_fs_t *fs, } static svn_error_t * -unparse_dir_entry(dirent_t *dirent, +unparse_dir_entry(svn_fs_x__dirent_t *dirent, svn_stream_t *stream, apr_pool_t *pool) { @@ -845,10 +845,10 @@ unparse_dir_entries(apr_array_header_t * int i; for (i = 0; i < entries->nelts; ++i) { - dirent_t *dirent; + svn_fs_x__dirent_t *dirent; svn_pool_clear(iterpool); - dirent = APR_ARRAY_IDX(entries, i, dirent_t *); + dirent = APR_ARRAY_IDX(entries, i, svn_fs_x__dirent_t *); SVN_ERR(unparse_dir_entry(dirent, stream, iterpool)); } @@ -1731,7 +1731,7 @@ svn_fs_x__set_entry(svn_fs_t *fs, /* Append an incremental hash entry for the entry change. */ if (id) { - dirent_t entry; + svn_fs_x__dirent_t entry; entry.name = name; entry.id = *id; entry.kind = kind; @@ -2504,7 +2504,7 @@ write_hash_to_stream(svn_stream_t *strea return SVN_NO_ERROR; } -/* Implement collection_writer_t writing the dirent_t* array given +/* Implement collection_writer_t writing the svn_fs_x__dirent_t* array given as BATON. */ static svn_error_t * write_directory_to_stream(svn_stream_t *stream, @@ -2809,7 +2809,7 @@ write_final_rev(svn_fs_x__id_t *new_id_p subpool)); for (i = 0; i < entries->nelts; ++i) { - dirent_t *dirent = APR_ARRAY_IDX(entries, i, dirent_t *); + svn_fs_x__dirent_t *dirent = APR_ARRAY_IDX(entries, i, svn_fs_x__dirent_t *); svn_pool_clear(subpool); SVN_ERR(write_final_rev(&new_id, file, rev, fs, &dirent->id, Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1649062&r1=1649061&r2=1649062&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_x/tree.c (original) +++ subversion/trunk/subversion/libsvn_fs_x/tree.c Fri Jan 2 15:12:05 2015 @@ -1659,8 +1659,8 @@ compare_dir_structure(svn_boolean_t *cha entries one-by-one without binary lookup etc. */ for (i = 0; i < lhs_entries->nelts; ++i) { - dirent_t *lhs_entry = APR_ARRAY_IDX(lhs_entries, i, dirent_t *); - dirent_t *rhs_entry = APR_ARRAY_IDX(rhs_entries, i, dirent_t *); + svn_fs_x__dirent_t *lhs_entry = APR_ARRAY_IDX(lhs_entries, i, svn_fs_x__dirent_t *); + svn_fs_x__dirent_t *rhs_entry = APR_ARRAY_IDX(rhs_entries, i, svn_fs_x__dirent_t *); if (strcmp(lhs_entry->name, rhs_entry->name) == 0) { @@ -1906,10 +1906,10 @@ merge(svn_stringbuf_t *conflict_p, iterpool = svn_pool_create(pool); for (i = 0; i < a_entries->nelts; ++i) { - dirent_t *s_entry, *t_entry, *a_entry; + svn_fs_x__dirent_t *s_entry, *t_entry, *a_entry; svn_pool_clear(iterpool); - a_entry = APR_ARRAY_IDX(a_entries, i, dirent_t *); + a_entry = APR_ARRAY_IDX(a_entries, i, svn_fs_x__dirent_t *); s_entry = svn_fs_x__find_dir_entry(s_entries, a_entry->name, &s_idx); t_entry = svn_fs_x__find_dir_entry(t_entries, a_entry->name, &t_idx); @@ -2019,13 +2019,13 @@ merge(svn_stringbuf_t *conflict_p, /* For each entry E in source but not in ancestor */ for (i = 0; i < s_entries->nelts; ++i) { - dirent_t *a_entry, *s_entry, *t_entry; + svn_fs_x__dirent_t *a_entry, *s_entry, *t_entry; dag_node_t *s_ent_node; apr_int64_t mergeinfo_s; svn_pool_clear(iterpool); - s_entry = APR_ARRAY_IDX(s_entries, i, dirent_t *); + s_entry = APR_ARRAY_IDX(s_entries, i, svn_fs_x__dirent_t *); a_entry = svn_fs_x__find_dir_entry(a_entries, s_entry->name, &s_idx); t_entry = svn_fs_x__find_dir_entry(t_entries, s_entry->name, &t_idx); @@ -2333,7 +2333,7 @@ svn_fs_x__deltify(svn_fs_t *fs, /* Set *TABLE_P to a newly allocated APR hash table containing the entries of the directory at PATH in ROOT. The keys of the table are entry names, as byte strings, excluding the final null - character; the table's values are pointers to svn_fs_dirent_t + character; the table's values are pointers to svn_fs_svn_fs_x__dirent_t structures. Allocate the table and its contents in POOL. */ static svn_error_t * x_dir_entries(apr_hash_t **table_p, @@ -2357,7 +2357,7 @@ x_dir_entries(apr_hash_t **table_p, /* Convert directory array to hash. */ for (i = 0; i < table->nelts; ++i) { - dirent_t *entry = APR_ARRAY_IDX(table, i, dirent_t *); + svn_fs_x__dirent_t *entry = APR_ARRAY_IDX(table, i, svn_fs_x__dirent_t *); svn_fs_dirent_t *api_dirent = apr_pcalloc(pool, sizeof(*api_dirent)); api_dirent->name = entry->name; @@ -3800,7 +3800,7 @@ crawl_directory_dag_for_mergeinfo(svn_fs SVN_ERR(svn_fs_x__dag_dir_entries(&entries, dir_dag, scratch_pool)); for (i = 0; i < entries->nelts; ++i) { - dirent_t *dirent = APR_ARRAY_IDX(entries, i, dirent_t *); + svn_fs_x__dirent_t *dirent = APR_ARRAY_IDX(entries, i, svn_fs_x__dirent_t *); const char *kid_path; dag_node_t *kid_dag; svn_boolean_t has_mergeinfo, go_down; @@ -4355,7 +4355,7 @@ verify_node(dag_node_t *node, /* Compute CHILDREN_MERGEINFO. */ for (i = 0; i < entries->nelts; ++i) { - dirent_t *dirent = APR_ARRAY_IDX(entries, i, dirent_t *); + svn_fs_x__dirent_t *dirent = APR_ARRAY_IDX(entries, i, svn_fs_x__dirent_t *); dag_node_t *child; apr_int64_t child_mergeinfo;