Skip to content

Commit 3f27127

Browse files
arrbeeVicent Marti
arrbee
authored and
Vicent Marti
committed
Simplify object table parse functions
This unifies the object parse functions into one signature that takes an odb_object.
1 parent 7860626 commit 3f27127

10 files changed

Lines changed: 63 additions & 57 deletions

File tree

‎src/blob.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void git_blob__free(void *blob)
4141
git__free(blob);
4242
}
4343

44-
int git_blob__from_odb_object(void *blob, git_odb_object *odb_obj)
44+
int git_blob__parse(void *blob, git_odb_object *odb_obj)
4545
{
4646
assert(blob);
4747
git_cached_obj_incref((git_cached_obj *)odb_obj);

‎src/blob.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ struct git_blob {
1818
};
1919

2020
void git_blob__free(void *blob);
21-
int git_blob__from_odb_object(void *blob, git_odb_object *obj);
21+
int git_blob__parse(void *blob, git_odb_object *obj);
2222
int git_blob__getbuf(git_buf *buffer, git_blob *blob);
2323

2424
#endif

‎src/commit.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,11 @@ int git_commit_create(
168168
return retval;
169169
}
170170

171-
int git_commit__parse(void *_commit, const char *buffer, const char *buffer_end)
171+
int git_commit__parse(void *_commit, git_odb_object *odb_obj)
172172
{
173173
git_commit *commit = _commit;
174+
const char *buffer = git_odb_object_data(odb_obj);
175+
const char *buffer_end = buffer + git_odb_object_size(odb_obj);
174176
git_oid parent_id;
175177

176178
if (git_vector_init(&commit->parent_ids, 4, NULL) < 0)

‎src/commit.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ struct git_commit {
2828
};
2929

3030
void git_commit__free(void *commit);
31-
int git_commit__parse(void *commit, const char *buf, const char *bufend);
31+
int git_commit__parse(void *commit, git_odb_object *obj);
3232

3333
#endif

‎src/object.c‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,32 @@ typedef struct {
2222
const char *str; /* type name string */
2323
size_t size; /* size in bytes of the object structure */
2424

25-
int (*from_odb)(void *self, git_odb_object *obj);
26-
int (*parse)(void *self, const char *buf, const char *buf_end);
25+
int (*parse)(void *self, git_odb_object *obj);
2726
void (*free)(void *self);
2827
} git_object_def;
2928

3029
static git_object_def git_objects_table[] = {
3130
/* 0 = GIT_OBJ__EXT1 */
32-
{ "", 0, NULL, NULL, NULL },
31+
{ "", 0, NULL, NULL },
3332

3433
/* 1 = GIT_OBJ_COMMIT */
35-
{ "commit", sizeof(git_commit), NULL, git_commit__parse, git_commit__free },
34+
{ "commit", sizeof(git_commit), git_commit__parse, git_commit__free },
3635

3736
/* 2 = GIT_OBJ_TREE */
38-
{ "tree", sizeof(git_tree), NULL, git_tree__parse, git_tree__free },
37+
{ "tree", sizeof(git_tree), git_tree__parse, git_tree__free },
3938

4039
/* 3 = GIT_OBJ_BLOB */
41-
{ "blob", sizeof(git_blob), git_blob__from_odb_object, NULL, git_blob__free },
40+
{ "blob", sizeof(git_blob), git_blob__parse, git_blob__free },
4241

4342
/* 4 = GIT_OBJ_TAG */
44-
{ "tag", sizeof(git_tag), NULL, git_tag__parse, git_tag__free },
43+
{ "tag", sizeof(git_tag), git_tag__parse, git_tag__free },
4544

4645
/* 5 = GIT_OBJ__EXT2 */
47-
{ "", 0, NULL, NULL, NULL },
46+
{ "", 0, NULL, NULL },
4847
/* 6 = GIT_OBJ_OFS_DELTA */
49-
{ "OFS_DELTA", 0, NULL, NULL, NULL },
48+
{ "OFS_DELTA", 0, NULL, NULL },
5049
/* 7 = GIT_OBJ_REF_DELTA */
51-
{ "REF_DELTA", 0, NULL, NULL, NULL },
50+
{ "REF_DELTA", 0, NULL, NULL },
5251
};
5352

5453
int git_object__from_odb_object(
@@ -88,22 +87,14 @@ int git_object__from_odb_object(
8887

8988
/* Parse raw object data */
9089
def = &git_objects_table[odb_obj->cached.type];
91-
assert(def->free && (def->from_odb || def->parse));
90+
assert(def->free && def->parse);
9291

93-
if (def->from_odb) {
94-
error = def->from_odb(object, odb_obj);
95-
} else {
96-
const char *data = (const char *)git_odb_object_data(odb_obj);
97-
error = def->parse(object, data, data + git_odb_object_size(odb_obj));
98-
}
99-
100-
if (error < 0) {
92+
if ((error = def->parse(object, odb_obj)) < 0)
10193
def->free(object);
102-
return error;
103-
}
94+
else
95+
*object_out = git_cache_store_parsed(&repo->objects, object);
10496

105-
*object_out = git_cache_store_parsed(&repo->objects, object);
106-
return 0;
97+
return error;
10798
}
10899

109100
void git_object__free(void *obj)

‎src/tag.c‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,12 @@ static int tag_error(const char *str)
7070
return -1;
7171
}
7272

73-
int git_tag__parse(void *_tag, const char *buffer, const char *buffer_end)
73+
static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
7474
{
7575
static const char *tag_types[] = {
7676
NULL, "commit\n", "tree\n", "blob\n", "tag\n"
7777
};
7878

79-
git_tag *tag = _tag;
8079
unsigned int i;
8180
size_t text_len;
8281
char *search;
@@ -157,6 +156,15 @@ int git_tag__parse(void *_tag, const char *buffer, const char *buffer_end)
157156
return 0;
158157
}
159158

159+
int git_tag__parse(void *_tag, git_odb_object *odb_obj)
160+
{
161+
git_tag *tag = _tag;
162+
const char *buffer = git_odb_object_data(odb_obj);
163+
const char *buffer_end = buffer + git_odb_object_size(odb_obj);
164+
165+
return tag_parse(tag, buffer, buffer_end);
166+
}
167+
160168
static int retrieve_tag_reference(
161169
git_reference **tag_reference_out,
162170
git_buf *ref_name_out,
@@ -277,23 +285,23 @@ static int git_tag_create__internal(
277285
}
278286

279287
int git_tag_create(
280-
git_oid *oid,
281-
git_repository *repo,
282-
const char *tag_name,
283-
const git_object *target,
284-
const git_signature *tagger,
285-
const char *message,
286-
int allow_ref_overwrite)
288+
git_oid *oid,
289+
git_repository *repo,
290+
const char *tag_name,
291+
const git_object *target,
292+
const git_signature *tagger,
293+
const char *message,
294+
int allow_ref_overwrite)
287295
{
288296
return git_tag_create__internal(oid, repo, tag_name, target, tagger, message, allow_ref_overwrite, 1);
289297
}
290298

291299
int git_tag_create_lightweight(
292-
git_oid *oid,
293-
git_repository *repo,
294-
const char *tag_name,
295-
const git_object *target,
296-
int allow_ref_overwrite)
300+
git_oid *oid,
301+
git_repository *repo,
302+
const char *tag_name,
303+
const git_object *target,
304+
int allow_ref_overwrite)
297305
{
298306
return git_tag_create__internal(oid, repo, tag_name, target, NULL, NULL, allow_ref_overwrite, 0);
299307
}
@@ -317,7 +325,7 @@ int git_tag_create_frombuffer(git_oid *oid, git_repository *repo, const char *bu
317325
return -1;
318326

319327
/* validate the buffer */
320-
if (git_tag__parse(&tag, buffer, buffer + strlen(buffer)) < 0)
328+
if (tag_parse(&tag, buffer, buffer + strlen(buffer)) < 0)
321329
return -1;
322330

323331
/* validate the target */

‎src/tag.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ struct git_tag {
2323
};
2424

2525
void git_tag__free(void *tag);
26-
int git_tag__parse(void *tag, const char *buf, const char *buf_end);
26+
int git_tag__parse(void *tag, git_odb_object *obj);
2727

2828
#endif

‎src/tree.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,10 @@ static int tree_error(const char *str, const char *path)
372372
return -1;
373373
}
374374

375-
int git_tree__parse(void *tree, const char *buffer, const char *buffer_end)
375+
int git_tree__parse(void *tree, git_odb_object *odb_obj)
376376
{
377+
const char *buffer = git_odb_object_data(odb_obj);
378+
const char *buffer_end = buffer + git_odb_object_size(odb_obj);
377379
git_vector *tree_entries = &((git_tree *)tree)->entries;
378380

379381
if (git_vector_init(tree_entries, DEFAULT_TREE_SIZE, entry_sort_cmp) < 0)

‎src/tree.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ GIT_INLINE(bool) git_tree_entry__is_tree(const struct git_tree_entry *e)
3838
extern int git_tree_entry_icmp(const git_tree_entry *e1, const git_tree_entry *e2);
3939

4040
void git_tree__free(void *tree);
41-
int git_tree__parse(void *tree, const char *buf, const char *buf_end);
41+
int git_tree__parse(void *tree, git_odb_object *obj);
4242

4343
/**
4444
* Lookup the first position in the tree with a given prefix.

‎tests-clar/commit/parse.c‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -266,32 +266,35 @@ a simple commit which works\n",
266266

267267
void test_commit_parse__entire_commit(void)
268268
{
269-
const int broken_commit_count = sizeof(failing_commit_cases) / sizeof(*failing_commit_cases);
270-
const int working_commit_count = sizeof(passing_commit_cases) / sizeof(*passing_commit_cases);
269+
const int failing_commit_count = ARRAY_SIZE(failing_commit_cases);
270+
const int passing_commit_count = ARRAY_SIZE(passing_commit_cases);
271271
int i;
272-
const char *buf;
272+
git_commit *commit;
273+
git_odb_object fake_odb_object;
274+
memset(&fake_odb_object, 0, sizeof(fake_odb_object));
273275

274-
for (i = 0; i < broken_commit_count; ++i) {
275-
git_commit *commit;
276+
for (i = 0; i < failing_commit_count; ++i) {
276277
commit = (git_commit*)git__malloc(sizeof(git_commit));
277278
memset(commit, 0x0, sizeof(git_commit));
278279
commit->object.repo = g_repo;
279280

280-
buf = failing_commit_cases[i];
281-
cl_git_fail(git_commit__parse(commit, buf, buf + strlen(buf)));
281+
fake_odb_object.buffer = failing_commit_cases[i];
282+
fake_odb_object.cached.size = strlen(fake_odb_object.buffer);
283+
284+
cl_git_fail(git_commit__parse(commit, &fake_odb_object));
282285

283286
git_commit__free(commit);
284287
}
285288

286-
for (i = 0; i < working_commit_count; ++i) {
287-
git_commit *commit;
288-
289+
for (i = 0; i < passing_commit_count; ++i) {
289290
commit = (git_commit*)git__malloc(sizeof(git_commit));
290291
memset(commit, 0x0, sizeof(git_commit));
291292
commit->object.repo = g_repo;
292293

293-
buf = passing_commit_cases[i];
294-
cl_git_pass(git_commit__parse(commit, buf, buf + strlen(buf)));
294+
fake_odb_object.buffer = passing_commit_cases[i];
295+
fake_odb_object.cached.size = strlen(fake_odb_object.buffer);
296+
297+
cl_git_pass(git_commit__parse(commit, &fake_odb_object));
295298

296299
if (!i)
297300
cl_assert_equal_s("", git_commit_message(commit));

0 commit comments

Comments
 (0)