From: Jeff King <peff@peff.net>
To: Derrick Stolee <derrickstolee@github.com>
Cc: git@vger.kernel.org, Jonathan Tan <jonathantanmy@google.com>
Subject: Re: [PATCH 0/5] cleaning up read_object() family of functions
Date: Wed, 11 Jan 2023 13:26:23 -0500 [thread overview]
Message-ID: <Y77/T8dktee3wOA5@coredump.intra.peff.net> (raw)
In-Reply-To: <f1028cba-5fc6-3584-3f21-545550012e9d@github.com>
On Mon, Jan 09, 2023 at 10:09:32AM -0500, Derrick Stolee wrote:
> I did think that requiring callers to create their own object_info
> structs (which takes at least four lines) would be too much, but
> the number of new callers is so low that I think this is a fine place
> to stop.
Yeah, that was my feeling. I do wonder if there's a way to make it
easier for callers of oid_object_info_extended(), but I couldn't come up
with anything that's nice enough to merit the complexity.
For example, here's an attempt to let the caller use designated
initializers to set up the query struct:
diff --git a/object-file.c b/object-file.c
index 80b08fc389..60ca75d755 100644
--- a/object-file.c
+++ b/object-file.c
@@ -1700,13 +1700,12 @@ void *repo_read_object_file(struct repository *r,
enum object_type *type,
unsigned long *size)
{
- struct object_info oi = OBJECT_INFO_INIT;
unsigned flags = OBJECT_INFO_DIE_IF_CORRUPT | OBJECT_INFO_LOOKUP_REPLACE;
void *data;
+ struct object_info oi = OBJECT_INFO(.typep = type,
+ .sizep = size,
+ .contentp = &data);
- oi.typep = type;
- oi.sizep = size;
- oi.contentp = &data;
if (oid_object_info_extended(r, oid, &oi, flags))
return NULL;
diff --git a/object-store.h b/object-store.h
index 1a713d89d7..e894cee61b 100644
--- a/object-store.h
+++ b/object-store.h
@@ -418,7 +418,8 @@ struct object_info {
* Initializer for a "struct object_info" that wants no items. You may
* also memset() the memory to all-zeroes.
*/
-#define OBJECT_INFO_INIT { 0 }
+#define OBJECT_INFO(...) { 0, __VA_ARGS__ }
+#define OBJECT_INFO_INIT OBJECT_INFO()
/* Invoke lookup_replace_object() on the given hash */
#define OBJECT_INFO_LOOKUP_REPLACE 1
But:
- it actually triggers a gcc warning, since OBJECT_INFO(.typep = foo)
sets typep twice (once for the default "0", and once by name). In
this case the "0" is superfluous, since that's the default, and we
could just do:
#define OBJECT_INFO(...) { __VA_ARGS__ }
#define OBJECT_INFO_INIT OBJECT_INFO(0)
but I was hoping to find a general technique for object
initializers.
- it's not really that much shorter than the existing code. The real
benefit of "data = read_object(oid, type, size)" is the implicit
number and names of the parameters. And the way to get that is to
provide an extra function.
So I think we are better off with the code that is longer but totally
obvious, unless we really want to add a function wrapper for common
queries as syntactic sugar.
-Peff
next prev parent reply other threads:[~2023-01-11 18:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-07 13:48 [PATCH 0/5] cleaning up read_object() family of functions Jeff King
2023-01-07 13:48 ` [PATCH 1/5] object-file: inline calls to read_object() Jeff King
2023-01-12 9:13 ` Ævar Arnfjörð Bjarmason
2023-01-12 16:06 ` [PATCH] object-file: fix indent-with-space Jeff King
2023-01-12 16:08 ` Ævar Arnfjörð Bjarmason
2023-01-13 17:40 ` Junio C Hamano
2023-01-07 13:49 ` [PATCH 2/5] streaming: inline call to read_object_file_extended() Jeff King
2023-01-07 13:50 ` [PATCH 3/5] read_object_file_extended(): drop lookup_replace option Jeff King
2023-01-07 13:50 ` [PATCH 4/5] repo_read_object_file(): stop wrapping read_object_file_extended() Jeff King
2023-01-07 13:50 ` [PATCH 5/5] packfile: inline custom read_object() Jeff King
2023-01-12 9:01 ` Ævar Arnfjörð Bjarmason
2023-01-12 16:29 ` Jeff King
2023-01-09 15:09 ` [PATCH 0/5] cleaning up read_object() family of functions Derrick Stolee
2023-01-11 18:26 ` Jeff King [this message]
2023-01-11 20:17 ` Derrick Stolee
2023-01-11 20:30 ` Jeff King
2023-01-12 9:21 ` Ævar Arnfjörð Bjarmason
2023-01-12 16:16 ` Jeff King
2023-01-12 16:22 ` Ævar Arnfjörð Bjarmason
2023-01-12 16:53 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y77/T8dktee3wOA5@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).