Skip to content

Commit 68b4cfb

Browse files
jrngitster
jrn
authored and
gitster
committed
vcs-svn: Rename dirent pool to build on Windows
dirent is #define’d to mingw_dirent in compat/mingw.h, with the result that obj_pool_gen(dirent, struct repo_dirent, 4096) creates functions with names like mingw_dirent_alloc and references to dirent_alloc go unresolved. Rename the functions to dent_* to avoid this problem. Reported-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 78457bc commit 68b4cfb

File tree

1 file changed

+73
-73
lines changed

1 file changed

+73
-73
lines changed

‎vcs-svn/repo_tree.c‎

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ struct repo_commit {
3030
/* Memory pools for commit, dir and dirent */
3131
obj_pool_gen(commit, struct repo_commit, 4096)
3232
obj_pool_gen(dir, struct repo_dir, 4096)
33-
obj_pool_gen(dirent, struct repo_dirent, 4096)
33+
obj_pool_gen(dent, struct repo_dirent, 4096)
3434

3535
static uint32_t active_commit;
3636
static uint32_t mark;
3737

3838
static int repo_dirent_name_cmp(const void *a, const void *b);
3939

4040
/* Treap for directory entries */
41-
trp_gen(static, dirent_, struct repo_dirent, children, dirent, repo_dirent_name_cmp);
41+
trp_gen(static, dent_, struct repo_dirent, children, dent, repo_dirent_name_cmp);
4242

4343
uint32_t next_blob_mark(void)
4444
{
@@ -52,27 +52,27 @@ static struct repo_dir *repo_commit_root_dir(struct repo_commit *commit)
5252

5353
static struct repo_dirent *repo_first_dirent(struct repo_dir *dir)
5454
{
55-
return dirent_first(&dir->entries);
55+
return dent_first(&dir->entries);
5656
}
5757

5858
static int repo_dirent_name_cmp(const void *a, const void *b)
5959
{
60-
const struct repo_dirent *dirent1 = a, *dirent2 = b;
61-
uint32_t a_offset = dirent1->name_offset;
62-
uint32_t b_offset = dirent2->name_offset;
60+
const struct repo_dirent *dent1 = a, *dent2 = b;
61+
uint32_t a_offset = dent1->name_offset;
62+
uint32_t b_offset = dent2->name_offset;
6363
return (a_offset > b_offset) - (a_offset < b_offset);
6464
}
6565

66-
static int repo_dirent_is_dir(struct repo_dirent *dirent)
66+
static int repo_dirent_is_dir(struct repo_dirent *dent)
6767
{
68-
return dirent != NULL && dirent->mode == REPO_MODE_DIR;
68+
return dent != NULL && dent->mode == REPO_MODE_DIR;
6969
}
7070

71-
static struct repo_dir *repo_dir_from_dirent(struct repo_dirent *dirent)
71+
static struct repo_dir *repo_dir_from_dirent(struct repo_dirent *dent)
7272
{
73-
if (!repo_dirent_is_dir(dirent))
73+
if (!repo_dirent_is_dir(dent))
7474
return NULL;
75-
return dir_pointer(dirent->content_offset);
75+
return dir_pointer(dent->content_offset);
7676
}
7777

7878
static struct repo_dir *repo_clone_dir(struct repo_dir *orig_dir)
@@ -90,19 +90,19 @@ static struct repo_dir *repo_clone_dir(struct repo_dir *orig_dir)
9090
static struct repo_dirent *repo_read_dirent(uint32_t revision, uint32_t *path)
9191
{
9292
uint32_t name = 0;
93-
struct repo_dirent *key = dirent_pointer(dirent_alloc(1));
93+
struct repo_dirent *key = dent_pointer(dent_alloc(1));
9494
struct repo_dir *dir = NULL;
95-
struct repo_dirent *dirent = NULL;
95+
struct repo_dirent *dent = NULL;
9696
dir = repo_commit_root_dir(commit_pointer(revision));
9797
while (~(name = *path++)) {
9898
key->name_offset = name;
99-
dirent = dirent_search(&dir->entries, key);
100-
if (dirent == NULL || !repo_dirent_is_dir(dirent))
99+
dent = dent_search(&dir->entries, key);
100+
if (dent == NULL || !repo_dirent_is_dir(dent))
101101
break;
102-
dir = repo_dir_from_dirent(dirent);
102+
dir = repo_dir_from_dirent(dent);
103103
}
104-
dirent_free(1);
105-
return dirent;
104+
dent_free(1);
105+
return dent;
106106
}
107107

108108
static void repo_write_dirent(uint32_t *path, uint32_t mode,
@@ -111,60 +111,60 @@ static void repo_write_dirent(uint32_t *path, uint32_t mode,
111111
uint32_t name, revision, dir_o = ~0, parent_dir_o = ~0;
112112
struct repo_dir *dir;
113113
struct repo_dirent *key;
114-
struct repo_dirent *dirent = NULL;
114+
struct repo_dirent *dent = NULL;
115115
revision = active_commit;
116116
dir = repo_commit_root_dir(commit_pointer(revision));
117117
dir = repo_clone_dir(dir);
118118
commit_pointer(revision)->root_dir_offset = dir_offset(dir);
119119
while (~(name = *path++)) {
120120
parent_dir_o = dir_offset(dir);
121121

122-
key = dirent_pointer(dirent_alloc(1));
122+
key = dent_pointer(dent_alloc(1));
123123
key->name_offset = name;
124124

125-
dirent = dirent_search(&dir->entries, key);
126-
if (dirent == NULL)
127-
dirent = key;
125+
dent = dent_search(&dir->entries, key);
126+
if (dent == NULL)
127+
dent = key;
128128
else
129-
dirent_free(1);
129+
dent_free(1);
130130

131-
if (dirent == key) {
132-
dirent->mode = REPO_MODE_DIR;
133-
dirent->content_offset = 0;
134-
dirent_insert(&dir->entries, dirent);
131+
if (dent == key) {
132+
dent->mode = REPO_MODE_DIR;
133+
dent->content_offset = 0;
134+
dent_insert(&dir->entries, dent);
135135
}
136136

137-
if (dirent_offset(dirent) < dirent_pool.committed) {
138-
dir_o = repo_dirent_is_dir(dirent) ?
139-
dirent->content_offset : ~0;
140-
dirent_remove(&dir->entries, dirent);
141-
dirent = dirent_pointer(dirent_alloc(1));
142-
dirent->name_offset = name;
143-
dirent->mode = REPO_MODE_DIR;
144-
dirent->content_offset = dir_o;
145-
dirent_insert(&dir->entries, dirent);
137+
if (dent_offset(dent) < dent_pool.committed) {
138+
dir_o = repo_dirent_is_dir(dent) ?
139+
dent->content_offset : ~0;
140+
dent_remove(&dir->entries, dent);
141+
dent = dent_pointer(dent_alloc(1));
142+
dent->name_offset = name;
143+
dent->mode = REPO_MODE_DIR;
144+
dent->content_offset = dir_o;
145+
dent_insert(&dir->entries, dent);
146146
}
147147

148-
dir = repo_dir_from_dirent(dirent);
148+
dir = repo_dir_from_dirent(dent);
149149
dir = repo_clone_dir(dir);
150-
dirent->content_offset = dir_offset(dir);
150+
dent->content_offset = dir_offset(dir);
151151
}
152-
if (dirent == NULL)
152+
if (dent == NULL)
153153
return;
154-
dirent->mode = mode;
155-
dirent->content_offset = content_offset;
154+
dent->mode = mode;
155+
dent->content_offset = content_offset;
156156
if (del && ~parent_dir_o)
157-
dirent_remove(&dir_pointer(parent_dir_o)->entries, dirent);
157+
dent_remove(&dir_pointer(parent_dir_o)->entries, dent);
158158
}
159159

160160
uint32_t repo_copy(uint32_t revision, uint32_t *src, uint32_t *dst)
161161
{
162162
uint32_t mode = 0, content_offset = 0;
163-
struct repo_dirent *src_dirent;
164-
src_dirent = repo_read_dirent(revision, src);
165-
if (src_dirent != NULL) {
166-
mode = src_dirent->mode;
167-
content_offset = src_dirent->content_offset;
163+
struct repo_dirent *src_dent;
164+
src_dent = repo_read_dirent(revision, src);
165+
if (src_dent != NULL) {
166+
mode = src_dent->mode;
167+
content_offset = src_dent->content_offset;
168168
repo_write_dirent(dst, mode, content_offset, 0);
169169
}
170170
return mode;
@@ -178,21 +178,21 @@ void repo_add(uint32_t *path, uint32_t mode, uint32_t blob_mark)
178178
uint32_t repo_replace(uint32_t *path, uint32_t blob_mark)
179179
{
180180
uint32_t mode = 0;
181-
struct repo_dirent *src_dirent;
182-
src_dirent = repo_read_dirent(active_commit, path);
183-
if (src_dirent != NULL) {
184-
mode = src_dirent->mode;
181+
struct repo_dirent *src_dent;
182+
src_dent = repo_read_dirent(active_commit, path);
183+
if (src_dent != NULL) {
184+
mode = src_dent->mode;
185185
repo_write_dirent(path, mode, blob_mark, 0);
186186
}
187187
return mode;
188188
}
189189

190190
void repo_modify(uint32_t *path, uint32_t mode, uint32_t blob_mark)
191191
{
192-
struct repo_dirent *src_dirent;
193-
src_dirent = repo_read_dirent(active_commit, path);
194-
if (src_dirent != NULL && blob_mark == 0)
195-
blob_mark = src_dirent->content_offset;
192+
struct repo_dirent *src_dent;
193+
src_dent = repo_read_dirent(active_commit, path);
194+
if (src_dent != NULL && blob_mark == 0)
195+
blob_mark = src_dent->content_offset;
196196
repo_write_dirent(path, mode, blob_mark, 0);
197197
}
198198

@@ -203,13 +203,13 @@ void repo_delete(uint32_t *path)
203203

204204
static void repo_git_add_r(uint32_t depth, uint32_t *path, struct repo_dir *dir);
205205

206-
static void repo_git_add(uint32_t depth, uint32_t *path, struct repo_dirent *dirent)
206+
static void repo_git_add(uint32_t depth, uint32_t *path, struct repo_dirent *dent)
207207
{
208-
if (repo_dirent_is_dir(dirent))
209-
repo_git_add_r(depth, path, repo_dir_from_dirent(dirent));
208+
if (repo_dirent_is_dir(dent))
209+
repo_git_add_r(depth, path, repo_dir_from_dirent(dent));
210210
else
211211
fast_export_modify(depth, path,
212-
dirent->mode, dirent->content_offset);
212+
dent->mode, dent->content_offset);
213213
}
214214

215215
static void repo_git_add_r(uint32_t depth, uint32_t *path, struct repo_dir *dir)
@@ -218,7 +218,7 @@ static void repo_git_add_r(uint32_t depth, uint32_t *path, struct repo_dir *dir)
218218
while (de) {
219219
path[depth] = de->name_offset;
220220
repo_git_add(depth + 1, path, de);
221-
de = dirent_next(&dir->entries, de);
221+
de = dent_next(&dir->entries, de);
222222
}
223223
}
224224

@@ -233,13 +233,13 @@ static void repo_diff_r(uint32_t depth, uint32_t *path, struct repo_dir *dir1,
233233
if (de1->name_offset < de2->name_offset) {
234234
path[depth] = de1->name_offset;
235235
fast_export_delete(depth + 1, path);
236-
de1 = dirent_next(&dir1->entries, de1);
236+
de1 = dent_next(&dir1->entries, de1);
237237
continue;
238238
}
239239
if (de1->name_offset > de2->name_offset) {
240240
path[depth] = de2->name_offset;
241241
repo_git_add(depth + 1, path, de2);
242-
de2 = dirent_next(&dir2->entries, de2);
242+
de2 = dent_next(&dir2->entries, de2);
243243
continue;
244244
}
245245
path[depth] = de1->name_offset;
@@ -257,18 +257,18 @@ static void repo_diff_r(uint32_t depth, uint32_t *path, struct repo_dir *dir1,
257257
fast_export_delete(depth + 1, path);
258258
repo_git_add(depth + 1, path, de2);
259259
}
260-
de1 = dirent_next(&dir1->entries, de1);
261-
de2 = dirent_next(&dir2->entries, de2);
260+
de1 = dent_next(&dir1->entries, de1);
261+
de2 = dent_next(&dir2->entries, de2);
262262
}
263263
while (de1) {
264264
path[depth] = de1->name_offset;
265265
fast_export_delete(depth + 1, path);
266-
de1 = dirent_next(&dir1->entries, de1);
266+
de1 = dent_next(&dir1->entries, de1);
267267
}
268268
while (de2) {
269269
path[depth] = de2->name_offset;
270270
repo_git_add(depth + 1, path, de2);
271-
de2 = dirent_next(&dir2->entries, de2);
271+
de2 = dent_next(&dir2->entries, de2);
272272
}
273273
}
274274

@@ -286,7 +286,7 @@ void repo_commit(uint32_t revision, uint32_t author, char *log, uint32_t uuid,
286286
uint32_t url, unsigned long timestamp)
287287
{
288288
fast_export_commit(revision, author, log, uuid, url, timestamp);
289-
dirent_commit();
289+
dent_commit();
290290
dir_commit();
291291
active_commit = commit_alloc(1);
292292
commit_pointer(active_commit)->root_dir_offset =
@@ -297,10 +297,10 @@ static void mark_init(void)
297297
{
298298
uint32_t i;
299299
mark = 0;
300-
for (i = 0; i < dirent_pool.size; i++)
301-
if (!repo_dirent_is_dir(dirent_pointer(i)) &&
302-
dirent_pointer(i)->content_offset > mark)
303-
mark = dirent_pointer(i)->content_offset;
300+
for (i = 0; i < dent_pool.size; i++)
301+
if (!repo_dirent_is_dir(dent_pointer(i)) &&
302+
dent_pointer(i)->content_offset > mark)
303+
mark = dent_pointer(i)->content_offset;
304304
mark++;
305305
}
306306

@@ -325,5 +325,5 @@ void repo_reset(void)
325325
pool_reset();
326326
commit_reset();
327327
dir_reset();
328-
dirent_reset();
328+
dent_reset();
329329
}

0 commit comments

Comments
 (0)