From: Elijah Newren <newren@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Ævar Arnfjörð" <avarab@gmail.com>, "Jeff King" <peff@peff.net>,
"Ramsay Jones" <ramsay@ramsayjones.plus.com>
Subject: Re: [PATCHv3 1/6] Add missing includes and forward declares
Date: Tue, 14 Aug 2018 22:50:02 -0700 [thread overview]
Message-ID: <CABPp-BFk2X5TApYzs3QtdokBs3Hqz9uX737M6RGMtaU+wYUikw@mail.gmail.com> (raw)
In-Reply-To: <20180815051011.GC32543@aiede.svl.corp.google.com>
On Tue, Aug 14, 2018 at 10:10 PM Jonathan Nieder <jrnieder@gmail.com> wrote:
>
> Elijah Newren wrote:
>
> > Subject: Add missing includes and forward declares
>
> nit: s/declares/declarations/
Thanks.
> This is a huge patch. Was it autogenerated or generated manually?
> Can the commit message say something about methodology?
Mostly manually. I had a simple program that would create a dummy.c
file that included git-compat-util.h then exactly one header, compile
it, and spit any compile errors at me. I repeated that through the
top-level headers.
I didn't want to repeat that description in all 6 patches, since all
six came from that, so I put it in the cover letter. Since patch #1
has most that changes though, I guess it makes sense to include it at
least in that one?
> Is there an easy way to review it? (Keep in mind that I'm super lazy.
> ;-))
I guess I could send you my hacky python script that loops through the
top-level header files and creates the dummy two-line c file, and you
could inspect it and run it. But that only verifies that it compiles,
not that the changes I choose are "correct".
>
> > Signed-off-by: Elijah Newren <newren@gmail.com>
> > ---
> [...]
> > --- a/alloc.h
> > +++ b/alloc.h
> > @@ -1,9 +1,11 @@
> > #ifndef ALLOC_H
> > #define ALLOC_H
> >
> > +struct alloc_state;
> > struct tree;
> > struct commit;
> > struct tag;
> > +struct repository;
> >
> > void *alloc_blob_node(struct repository *r);
>
> That's reasonable. Going forward, is there a way to tell if some of
> these forward declarations are no longer needed at some point in the
> future (e.g. can clang be convinced to warn us about it)?
I'm not aware of anything currently; while I could have easily missed
things, projects like
https://github.com/include-what-you-use/include-what-you-use (which
look active and have a July 2018 date on them) make me suspect there
isn't a good answer currently.
> [...]
> > --- a/apply.h
> > +++ b/apply.h
> > @@ -1,6 +1,9 @@
> > #ifndef APPLY_H
> > #define APPLY_H
> >
> > +#include "lockfile.h"
> > +#include "string-list.h"
> > +
> > enum apply_ws_error_action {
>
> Here, to avoid strange behavior, we have to be careful to make sure
> the headers don't #include apply.h back. It's a pretty high-level
> header so there's no risk of that *phew*.
:-)
> [...]
> > --- a/archive.h
> > +++ b/archive.h
> > @@ -3,6 +3,9 @@
> >
> > #include "pathspec.h"
> >
> > +struct object_id;
> > +enum object_type;
>
> enums are of unknown size, so forward declarations don't work for
> them. See bb/pedantic for some examples.
structs are also of unknown size; the size is irrelevant when the
function signature merely uses a pointer to the struct or enum. The
enum forward declaration fixes a compilation bug.
> enum object_type is defined in cache.h, so should this #include that?
We could, but we don't need the definition; a forward declaration is sufficient.
> [...]
> > --- a/commit-graph.h
> > +++ b/commit-graph.h
> > @@ -4,6 +4,7 @@
> > #include "git-compat-util.h"
> > #include "repository.h"
> > #include "string-list.h"
> > +#include "cache.h"
>
> We can skip the #include of git-compat-util.h since all .c files
> include it.
Good point. Should I go through and remove all the inclusions of
git-compat-util.h in header files?
> [...]
> > --- a/fsmonitor.h
> > +++ b/fsmonitor.h
> > @@ -1,6 +1,13 @@
> > #ifndef FSMONITOR_H
> > #define FSMONITOR_H
> >
> > +#include "cache.h"
> > +#include "dir.h"
> > +
> > +struct cache_entry;
> > +struct index_state;
> > +struct strbuf;
>
> cache_entry et al are defined in cache.h, right? Are these forward
> decls needed?
Good catch; they can be removed. I'm pretty sure I added the forward
declarations first, then noticed it wasn't enough, added the cache.h
include, and forgot to clean up.
> [...]
> > --- a/merge-recursive.h
> > +++ b/merge-recursive.h
> > @@ -1,8 +1,10 @@
> > #ifndef MERGE_RECURSIVE_H
> > #define MERGE_RECURSIVE_H
> >
> > -#include "unpack-trees.h"
> > #include "string-list.h"
> > +#include "unpack-trees.h"
>
> just curious, no need to change: where does this reordering come from?
Well, since I was manually editing anyway, I saw these and decided to
alphabetize it since it's a file I deal with a lot. *shrug*
> [...]
> > --- a/pathspec.h
> > +++ b/pathspec.h
> > @@ -1,6 +1,11 @@
> > #ifndef PATHSPEC_H
> > #define PATHSPEC_H
> >
> > +#include "string.h"
> > +#include "strings.h"
>
> What are these headers?
The original patch[1] had explanations of why I added them:
+#include "string.h" /* For str[n]cmp */
+#include "strings.h" /* For str[n]casecmp */
But Peff requested that I remove the comments.
[1] https://public-inbox.org/git/20180811043218.31456-2-newren@gmail.com/
> The rest looks good.
>
> Thanks and hope that helps,
> Jonathan
Thanks for taking a look!
next prev parent reply other threads:[~2018-08-15 5:50 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-11 4:32 [PATCH 0/9] Add missing includes and forward declares Elijah Newren
2018-08-11 4:32 ` [PATCH 1/9] " Elijah Newren
2018-08-11 17:43 ` Jeff King
2018-08-11 4:32 ` [PATCH 2/9] alloc: make allocate_alloc_state and clear_alloc_state more consistent Elijah Newren
2018-08-11 4:32 ` [PATCH 3/9] Move definition of enum branch_track from cache.h to branch.h Elijah Newren
2018-08-11 4:32 ` [PATCH 4/9] urlmatch.h: fix include guard Elijah Newren
2018-08-11 4:32 ` [PATCH 5/9] compat/precompose_utf8.h: use more common include guard style Elijah Newren
2018-08-11 4:32 ` [PATCH 6/9] ewah/ewok.h: add missing include Elijah Newren
2018-08-11 4:32 ` [PATCH 7/9] sha1dc/sha1.h: " Elijah Newren
2018-08-11 4:32 ` [PATCH 8/9] xdiff/xdiff.h: " Elijah Newren
2018-08-11 4:32 ` [PATCH 9/9] Add missing includes and forward declares Elijah Newren
2018-08-11 8:30 ` [PATCH 0/9] " Ævar Arnfjörð Bjarmason
2018-08-11 8:59 ` Elijah Newren
2018-08-11 17:34 ` Jeff King
2018-08-13 18:24 ` Junio C Hamano
2018-08-14 6:42 ` Elijah Newren
2018-08-15 5:45 ` Junio C Hamano
2018-08-15 5:57 ` Elijah Newren
2018-08-15 15:43 ` Junio C Hamano
2018-08-15 15:55 ` Elijah Newren
2018-08-15 16:11 ` Junio C Hamano
2018-08-15 1:38 ` Jeff King
2018-08-15 4:55 ` Jonathan Nieder
2018-08-15 4:57 ` Jonathan Nieder
2018-08-11 20:50 ` [PATCHv2 0/6] " Elijah Newren
2018-08-11 20:50 ` [PATCHv2 1/6] " Elijah Newren
2018-08-11 20:50 ` [PATCHv2 2/6] alloc: make allocate_alloc_state and clear_alloc_state more consistent Elijah Newren
2018-08-11 20:50 ` [PATCHv2 3/6] Move definition of enum branch_track from cache.h to branch.h Elijah Newren
2018-08-11 21:32 ` Ramsay Jones
2018-08-11 20:50 ` [PATCHv2 4/6] urlmatch.h: fix include guard Elijah Newren
2018-08-11 20:50 ` [PATCHv2 5/6] compat/precompose_utf8.h: use more common include guard style Elijah Newren
2018-08-11 20:50 ` [PATCHv2 6/6] Add missing includes and forward declares Elijah Newren
2018-08-13 17:17 ` [PATCHv3 0/6] " Elijah Newren
2018-08-13 17:17 ` [PATCHv3 1/6] " Elijah Newren
2018-08-15 5:10 ` Jonathan Nieder
2018-08-15 5:50 ` Elijah Newren [this message]
2018-08-15 6:13 ` Jonathan Nieder
2018-08-15 6:51 ` Elijah Newren
2018-08-15 15:26 ` Elijah Newren
2018-08-13 17:17 ` [PATCHv3 2/6] alloc: make allocate_alloc_state and clear_alloc_state more consistent Elijah Newren
2018-08-15 5:18 ` Jonathan Nieder
2018-08-13 17:17 ` [PATCHv3 3/6] Move definition of enum branch_track from cache.h to branch.h Elijah Newren
2018-08-15 5:22 ` Jonathan Nieder
2018-08-13 17:17 ` [PATCHv3 4/6] urlmatch.h: fix include guard Elijah Newren
2018-08-15 5:25 ` Jonathan Nieder
2018-08-13 17:17 ` [PATCHv3 5/6] compat/precompose_utf8.h: use more common include guard style Elijah Newren
2018-08-15 5:28 ` Jonathan Nieder
2018-08-13 17:17 ` [PATCHv3 6/6] Add missing includes and forward declares Elijah Newren
2018-08-15 5:31 ` Jonathan Nieder
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=CABPp-BFk2X5TApYzs3QtdokBs3Hqz9uX737M6RGMtaU+wYUikw@mail.gmail.com \
--to=newren@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.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).