ref-filter: merge get_obj and get_object
Inline get_obj(): it would be easier to edit the code without this split. Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Olga Telezhnaya committed
Jul 17, 2018 at 08:22 UTC
e2255179f68970eb8ed7118334a23970283cb8ec
1 file changed
+11
-25
ref-filter.c
+11
-25
@@ -797,24 +797,6 @@ int verify_ref_format(struct ref_format *format)
797
return 0;
798
}
799
800
-/*
801
- * Given an object name, read the object data and size, and return a
802
- * "struct object". If the object data we are returning is also borrowed
803
- * by the "struct object" representation, set *eaten as well---it is a
804
- * signal from parse_object_buffer to us not to free the buffer.
805
- */
806
-static void *get_obj(const struct object_id *oid, struct object **obj, unsigned long *sz, int *eaten)
807
-{
808
- enum object_type type;
809
- void *buf = read_object_file(oid, &type, sz);
810
-
811
- if (buf)
812
- *obj = parse_object_buffer(oid, type, *sz, buf, eaten);
813
- else
814
- *obj = NULL;
815
- return buf;
816
-}
817
-
800
static int grab_objectname(const char *name, const struct object_id *oid,
801
struct atom_value *v, struct used_atom *atom)
802
{
@@ -1437,21 +1419,25 @@ static const char *get_refname(struct used_atom *atom, struct ref_array_item *re
1419
}
1420
1421
static int get_object(struct ref_array_item *ref, const struct object_id *oid,
1440
- int deref, struct object **obj, struct strbuf *err)
1422
+ int deref, struct object **obj, struct strbuf *err)
1423
{
1424
/* parse_object_buffer() will set eaten to 0 if free() will be needed */
1425
int eaten = 1;
1426
int ret = 0;
1427
unsigned long size;
1446
- void *buf = get_obj(oid, obj, &size, &eaten);
1428
+ enum object_type type;
1429
+ void *buf = read_object_file(oid, &type, &size);
1430
if (!buf)
1431
ret = strbuf_addf_ret(err, -1, _("missing object %s for %s"),
1432
oid_to_hex(oid), ref->refname);
1450
- else if (!*obj)
1451
- ret = strbuf_addf_ret(err, -1, _("parse_object_buffer failed on %s for %s"),
1452
- oid_to_hex(oid), ref->refname);
1453
- else
1454
- grab_values(ref->value, deref, *obj, buf, size);
1433
+ else {
1434
+ *obj = parse_object_buffer(oid, type, size, buf, &eaten);
1435
+ if (!*obj)
1436
+ ret = strbuf_addf_ret(err, -1, _("parse_object_buffer failed on %s for %s"),
1437
+ oid_to_hex(oid), ref->refname);
1438
+ else
1439
+ grab_values(ref->value, deref, *obj, buf, size);
1440
+ }
1441
if (!eaten)
1442
free(buf);
1443
return ret;