From: Junio C Hamano Date: Mon, 10 Mar 2025 20:51:37 GMT Subject: Re: [PATCH 1/4] rev-list: inline `show_object_with_name()` in `show_object()` Message-ID: In-Reply-To: <20250310192829.661692-2-jltobler@gmail.com> Justin Tobler writes: > The `show_object_with_name()` function only has a single call site. > Inline call to `show_object_with_name()` in `show_object()` so the > explicit function can be cleaned up and live closer to where it is used. > While at it, factor out the code that prints the OID and newline for > both objects with and without a name. In a subsequent commit, > `show_object()` is modified to support printing object information in a > NUL-delimited format. > > Signed-off-by: Justin Tobler > --- > builtin/rev-list.c | 13 +++++++++---- > revision.c | 8 -------- > revision.h | 2 -- > 3 files changed, 9 insertions(+), 14 deletions(-) > > diff --git a/builtin/rev-list.c b/builtin/rev-list.c > index bb26bee0d4..dcd079c16c 100644 > --- a/builtin/rev-list.c > +++ b/builtin/rev-list.c > @@ -357,10 +357,15 @@ static void show_object(struct object *obj, const char *name, void *cb_data) > return; > } > > - if (arg_show_object_names) > - show_object_with_name(stdout, obj, name); > - else > - printf("%s\n", oid_to_hex(&obj->oid)); > + printf("%s", oid_to_hex(&obj->oid)); > + > + if (arg_show_object_names) { > + putchar(' '); > + for (const char *p = name; *p && *p != '\n'; p++) > + putchar(*p); > + } > + > + putchar('\n'); > } Makes sense.