* [PATCH 1/2] ref-filter: get rid of duplicate code
@ 2018-02-21 6:59 Olga Telezhnaya
2018-02-21 6:59 ` [PATCH 2/2] ref-filter: get rid of goto Olga Telezhnaya
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Olga Telezhnaya @ 2018-02-21 6:59 UTC (permalink / raw)
To: git
Make one function from 2 duplicate pieces and invoke it twice.
Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored by: Jeff King <peff@peff.net>
---
ref-filter.c | 45 +++++++++++++++++++++------------------------
1 file changed, 21 insertions(+), 24 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index f9e25aea7a97e..83ffd84affe52 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1354,15 +1354,31 @@ static const char *get_refname(struct used_atom *atom, struct ref_array_item *re
return show_ref(&atom->u.refname, ref->refname);
}
+static void get_object(struct ref_array_item *ref, const struct object_id *oid,
+ int deref, struct object **obj)
+{
+ int eaten;
+ unsigned long size;
+ void *buf = get_obj(oid, obj, &size, &eaten);
+ if (!buf)
+ die(_("missing object %s for %s"),
+ oid_to_hex(oid), ref->refname);
+ if (!*obj)
+ die(_("parse_object_buffer failed on %s for %s"),
+ oid_to_hex(oid), ref->refname);
+
+ grab_values(ref->value, deref, *obj, buf, size);
+ if (!eaten)
+ free(buf);
+}
+
/*
* Parse the object referred by ref, and grab needed value.
*/
static void populate_value(struct ref_array_item *ref)
{
- void *buf;
struct object *obj;
- int eaten, i;
- unsigned long size;
+ int i;
const struct object_id *tagged;
ref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value));
@@ -1483,17 +1499,7 @@ static void populate_value(struct ref_array_item *ref)
return;
need_obj:
- buf = get_obj(&ref->objectname, &obj, &size, &eaten);
- if (!buf)
- die(_("missing object %s for %s"),
- oid_to_hex(&ref->objectname), ref->refname);
- if (!obj)
- die(_("parse_object_buffer failed on %s for %s"),
- oid_to_hex(&ref->objectname), ref->refname);
-
- grab_values(ref->value, 0, obj, buf, size);
- if (!eaten)
- free(buf);
+ get_object(ref, &ref->objectname, 0, &obj);
/*
* If there is no atom that wants to know about tagged
@@ -1514,16 +1520,7 @@ static void populate_value(struct ref_array_item *ref)
* is not consistent with what deref_tag() does
* which peels the onion to the core.
*/
- buf = get_obj(tagged, &obj, &size, &eaten);
- if (!buf)
- die(_("missing object %s for %s"),
- oid_to_hex(tagged), ref->refname);
- if (!obj)
- die(_("parse_object_buffer failed on %s for %s"),
- oid_to_hex(tagged), ref->refname);
- grab_values(ref->value, 1, obj, buf, size);
- if (!eaten)
- free(buf);
+ get_object(ref, tagged, 1, &obj);
}
/*
--
https://github.com/git/git/pull/460
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/2] ref-filter: get rid of goto
2018-02-21 6:59 [PATCH 1/2] ref-filter: get rid of duplicate code Olga Telezhnaya
@ 2018-02-21 6:59 ` Olga Telezhnaya
2018-02-21 17:41 ` Junio C Hamano
2018-02-21 7:02 ` [PATCH v2 1/2] ref-filter: get rid of duplicate code Olga Telezhnaya
2018-02-21 17:33 ` [PATCH 1/2] ref-filter: get rid of duplicate code Junio C Hamano
2 siblings, 1 reply; 7+ messages in thread
From: Olga Telezhnaya @ 2018-02-21 6:59 UTC (permalink / raw)
To: git
Get rid of goto command in ref-filter for better readability.
Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored by: Jeff King <peff@peff.net>
---
ref-filter.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 83ffd84affe52..28df6e21fb996 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1494,11 +1494,11 @@ static void populate_value(struct ref_array_item *ref)
for (i = 0; i < used_atom_cnt; i++) {
struct atom_value *v = &ref->value[i];
if (v->s == NULL)
- goto need_obj;
+ break;
}
- return;
+ if (used_atom_cnt <= i)
+ return;
- need_obj:
get_object(ref, &ref->objectname, 0, &obj);
/*
--
https://github.com/git/git/pull/460
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 2/2] ref-filter: get rid of goto
2018-02-21 6:59 ` [PATCH 2/2] ref-filter: get rid of goto Olga Telezhnaya
@ 2018-02-21 17:41 ` Junio C Hamano
2018-02-22 5:35 ` Оля Тележная
0 siblings, 1 reply; 7+ messages in thread
From: Junio C Hamano @ 2018-02-21 17:41 UTC (permalink / raw)
To: Olga Telezhnaya; +Cc: git
Olga Telezhnaya <olyatelezhnaya@gmail.com> writes:
> Get rid of goto command in ref-filter for better readability.
>
> Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
> Mentored-by: Christian Couder <christian.couder@gmail.com>
> Mentored by: Jeff King <peff@peff.net>
> ---
> ref-filter.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
It looks like this is the same change as the bottom-most change on
your "cat-file --batch" series (and is obviously correct).
I am puzzled by your intention---are you re-organizing and rebooting
the series? Either 'Yes' or 'No' is an acceptable answer, and so is
anything else. I just want to know what you want to happen to the
merge conflicts if I queued this while still keeping your "cat-file
--batch" thing I have on 'pu').
>
> diff --git a/ref-filter.c b/ref-filter.c
> index 83ffd84affe52..28df6e21fb996 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -1494,11 +1494,11 @@ static void populate_value(struct ref_array_item *ref)
> for (i = 0; i < used_atom_cnt; i++) {
> struct atom_value *v = &ref->value[i];
> if (v->s == NULL)
> - goto need_obj;
> + break;
> }
> - return;
> + if (used_atom_cnt <= i)
> + return;
>
> - need_obj:
> get_object(ref, &ref->objectname, 0, &obj);
>
> /*
>
> --
> https://github.com/git/git/pull/460
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 2/2] ref-filter: get rid of goto
2018-02-21 17:41 ` Junio C Hamano
@ 2018-02-22 5:35 ` Оля Тележная
0 siblings, 0 replies; 7+ messages in thread
From: Оля Тележная @ 2018-02-22 5:35 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
2018-02-21 20:41 GMT+03:00 Junio C Hamano <gitster@pobox.com>:
> Olga Telezhnaya <olyatelezhnaya@gmail.com> writes:
>
>> Get rid of goto command in ref-filter for better readability.
>>
>> Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
>> Mentored-by: Christian Couder <christian.couder@gmail.com>
>> Mentored by: Jeff King <peff@peff.net>
>> ---
>> ref-filter.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> It looks like this is the same change as the bottom-most change on
> your "cat-file --batch" series (and is obviously correct).
>
> I am puzzled by your intention---are you re-organizing and rebooting
> the series? Either 'Yes' or 'No' is an acceptable answer, and so is
> anything else. I just want to know what you want to happen to the
> merge conflicts if I queued this while still keeping your "cat-file
> --batch" thing I have on 'pu').
Thanks for the question, I needed to mention that.
We (with Peff) decided that it's better and easier to remake whole
previous patch. Before that, I want to make some refactorings in
ref-filter so after that migrating should go much easier. I want to do
that by small separate patches, so this is first in the series. I hope
it would be both easier to review for you and easier to fix for me.
So, if everything is fine, you could merge it to master. I will
rewrite most parts of previous patch anyway.
Thanks!
>
>>
>> diff --git a/ref-filter.c b/ref-filter.c
>> index 83ffd84affe52..28df6e21fb996 100644
>> --- a/ref-filter.c
>> +++ b/ref-filter.c
>> @@ -1494,11 +1494,11 @@ static void populate_value(struct ref_array_item *ref)
>> for (i = 0; i < used_atom_cnt; i++) {
>> struct atom_value *v = &ref->value[i];
>> if (v->s == NULL)
>> - goto need_obj;
>> + break;
>> }
>> - return;
>> + if (used_atom_cnt <= i)
>> + return;
>>
>> - need_obj:
>> get_object(ref, &ref->objectname, 0, &obj);
>>
>> /*
>>
>> --
>> https://github.com/git/git/pull/460
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] ref-filter: get rid of duplicate code
2018-02-21 6:59 [PATCH 1/2] ref-filter: get rid of duplicate code Olga Telezhnaya
2018-02-21 6:59 ` [PATCH 2/2] ref-filter: get rid of goto Olga Telezhnaya
@ 2018-02-21 7:02 ` Olga Telezhnaya
2018-02-21 7:02 ` [PATCH v2 2/2] ref-filter: get rid of goto Olga Telezhnaya
2018-02-21 17:33 ` [PATCH 1/2] ref-filter: get rid of duplicate code Junio C Hamano
2 siblings, 1 reply; 7+ messages in thread
From: Olga Telezhnaya @ 2018-02-21 7:02 UTC (permalink / raw)
To: git
Make one function from 2 duplicate pieces and invoke it twice.
Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored by: Jeff King <peff@peff.net>
---
ref-filter.c | 45 +++++++++++++++++++++------------------------
1 file changed, 21 insertions(+), 24 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index f9e25aea7a97e..83ffd84affe52 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1354,15 +1354,31 @@ static const char *get_refname(struct used_atom *atom, struct ref_array_item *re
return show_ref(&atom->u.refname, ref->refname);
}
+static void get_object(struct ref_array_item *ref, const struct object_id *oid,
+ int deref, struct object **obj)
+{
+ int eaten;
+ unsigned long size;
+ void *buf = get_obj(oid, obj, &size, &eaten);
+ if (!buf)
+ die(_("missing object %s for %s"),
+ oid_to_hex(oid), ref->refname);
+ if (!*obj)
+ die(_("parse_object_buffer failed on %s for %s"),
+ oid_to_hex(oid), ref->refname);
+
+ grab_values(ref->value, deref, *obj, buf, size);
+ if (!eaten)
+ free(buf);
+}
+
/*
* Parse the object referred by ref, and grab needed value.
*/
static void populate_value(struct ref_array_item *ref)
{
- void *buf;
struct object *obj;
- int eaten, i;
- unsigned long size;
+ int i;
const struct object_id *tagged;
ref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value));
@@ -1483,17 +1499,7 @@ static void populate_value(struct ref_array_item *ref)
return;
need_obj:
- buf = get_obj(&ref->objectname, &obj, &size, &eaten);
- if (!buf)
- die(_("missing object %s for %s"),
- oid_to_hex(&ref->objectname), ref->refname);
- if (!obj)
- die(_("parse_object_buffer failed on %s for %s"),
- oid_to_hex(&ref->objectname), ref->refname);
-
- grab_values(ref->value, 0, obj, buf, size);
- if (!eaten)
- free(buf);
+ get_object(ref, &ref->objectname, 0, &obj);
/*
* If there is no atom that wants to know about tagged
@@ -1514,16 +1520,7 @@ static void populate_value(struct ref_array_item *ref)
* is not consistent with what deref_tag() does
* which peels the onion to the core.
*/
- buf = get_obj(tagged, &obj, &size, &eaten);
- if (!buf)
- die(_("missing object %s for %s"),
- oid_to_hex(tagged), ref->refname);
- if (!obj)
- die(_("parse_object_buffer failed on %s for %s"),
- oid_to_hex(tagged), ref->refname);
- grab_values(ref->value, 1, obj, buf, size);
- if (!eaten)
- free(buf);
+ get_object(ref, tagged, 1, &obj);
}
/*
--
https://github.com/git/git/pull/460
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 1/2] ref-filter: get rid of duplicate code
2018-02-21 6:59 [PATCH 1/2] ref-filter: get rid of duplicate code Olga Telezhnaya
2018-02-21 6:59 ` [PATCH 2/2] ref-filter: get rid of goto Olga Telezhnaya
2018-02-21 7:02 ` [PATCH v2 1/2] ref-filter: get rid of duplicate code Olga Telezhnaya
@ 2018-02-21 17:33 ` Junio C Hamano
2 siblings, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2018-02-21 17:33 UTC (permalink / raw)
To: Olga Telezhnaya; +Cc: git
Olga Telezhnaya <olyatelezhnaya@gmail.com> writes:
> Make one function from 2 duplicate pieces and invoke it twice.
>
> Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
> Mentored-by: Christian Couder <christian.couder@gmail.com>
> Mentored by: Jeff King <peff@peff.net>
> ---
> ref-filter.c | 45 +++++++++++++++++++++------------------------
> 1 file changed, 21 insertions(+), 24 deletions(-)
Nice code reduction, removing 2 instances of 11-line section and
replacing with a 17-line function ;-)
This looks related to your earlier changes for "cat-file --batch"
but I do not recall seeing this refactoring. It seems to be done
correctly.
Good spotting.
> diff --git a/ref-filter.c b/ref-filter.c
> index f9e25aea7a97e..83ffd84affe52 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -1354,15 +1354,31 @@ static const char *get_refname(struct used_atom *atom, struct ref_array_item *re
> return show_ref(&atom->u.refname, ref->refname);
> }
>
> +static void get_object(struct ref_array_item *ref, const struct object_id *oid,
> + int deref, struct object **obj)
> +{
> + int eaten;
> + unsigned long size;
> + void *buf = get_obj(oid, obj, &size, &eaten);
> + if (!buf)
> + die(_("missing object %s for %s"),
> + oid_to_hex(oid), ref->refname);
> + if (!*obj)
> + die(_("parse_object_buffer failed on %s for %s"),
> + oid_to_hex(oid), ref->refname);
> +
> + grab_values(ref->value, deref, *obj, buf, size);
> + if (!eaten)
> + free(buf);
> +}
> +
> /*
> * Parse the object referred by ref, and grab needed value.
> */
> static void populate_value(struct ref_array_item *ref)
> {
> - void *buf;
> struct object *obj;
> - int eaten, i;
> - unsigned long size;
> + int i;
> const struct object_id *tagged;
>
> ref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value));
> @@ -1483,17 +1499,7 @@ static void populate_value(struct ref_array_item *ref)
> return;
>
> need_obj:
> - buf = get_obj(&ref->objectname, &obj, &size, &eaten);
> - if (!buf)
> - die(_("missing object %s for %s"),
> - oid_to_hex(&ref->objectname), ref->refname);
> - if (!obj)
> - die(_("parse_object_buffer failed on %s for %s"),
> - oid_to_hex(&ref->objectname), ref->refname);
> -
> - grab_values(ref->value, 0, obj, buf, size);
> - if (!eaten)
> - free(buf);
> + get_object(ref, &ref->objectname, 0, &obj);
>
> /*
> * If there is no atom that wants to know about tagged
> @@ -1514,16 +1520,7 @@ static void populate_value(struct ref_array_item *ref)
> * is not consistent with what deref_tag() does
> * which peels the onion to the core.
> */
> - buf = get_obj(tagged, &obj, &size, &eaten);
> - if (!buf)
> - die(_("missing object %s for %s"),
> - oid_to_hex(tagged), ref->refname);
> - if (!obj)
> - die(_("parse_object_buffer failed on %s for %s"),
> - oid_to_hex(tagged), ref->refname);
> - grab_values(ref->value, 1, obj, buf, size);
> - if (!eaten)
> - free(buf);
> + get_object(ref, tagged, 1, &obj);
> }
>
> /*
>
> --
> https://github.com/git/git/pull/460
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-02-22 5:35 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-21 6:59 [PATCH 1/2] ref-filter: get rid of duplicate code Olga Telezhnaya
2018-02-21 6:59 ` [PATCH 2/2] ref-filter: get rid of goto Olga Telezhnaya
2018-02-21 17:41 ` Junio C Hamano
2018-02-22 5:35 ` Оля Тележная
2018-02-21 7:02 ` [PATCH v2 1/2] ref-filter: get rid of duplicate code Olga Telezhnaya
2018-02-21 7:02 ` [PATCH v2 2/2] ref-filter: get rid of goto Olga Telezhnaya
2018-02-21 17:33 ` [PATCH 1/2] ref-filter: get rid of duplicate code Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).