[PATCH] imap-send: add missing "strbuf.h" include under NO_CURL

Philippe Blain via GitGitGadget· Feb 2, 2024, 00:18 UTC · lore

From: Philippe Blain <levraiphilippeblain@gmail.com>

Building with NO_CURL is currently broken since imap-send.c uses things defined in "strbuf.h" wihtout including it.

The inclusion of that header was removed in eea0e59ffb (treewide: remove unnecessary includes in source files, 2023-12-23), which failed to notice that "strbuf.h" was transitively included in imap-send.c via "http.h", but only if USE_CURL_FOR_IMAP_SEND is defined. Add back the missing include. Note that it was explicitely added in 3307f7dde2 (imap-send: include strbuf.h, 2023-05-17) after a similar breakage in ba3d1c73da (treewide: remove unnecessary cache.h includes, 2023-02-24) - see the thread starting at [1].

It can be verified by inspection that this is the only case where a header we include is dependent on a Makefile knob in the files modified in eea0e59ffb.

[1] https://lore.kernel.org/git/20230517070632.71884-1-list@eworm.de/

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
---
    imap-send: add missing "strbuf.h" include under NO_CURL

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1664%2Fphil-blain%2Fimap-send-include-no-openssl-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1664/phil-blain/imap-send-include-no-openssl-v1
Pull-Request: https://github.com/git/git/pull/1664

 imap-send.c | 1 +
 1 file changed, 1 insertion(+)

Show changes to imap-send.c +1 −0

diff --git a/imap-send.c b/imap-send.c
index d662811ee83..f2e1947e638 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -28,6 +28,7 @@
 #include "run-command.h"
 #include "parse-options.h"
 #include "setup.h"
+#include "strbuf.h"
 #if defined(NO_OPENSSL) && !defined(HAVE_OPENSSL_CSPRNG)
 typedef void *SSL;
 #endif

base-commit: bc7ee2e5e16f0d1e710ef8fab3db59ab11f2bbe7

-- 
gitgitgadget

Elijah Newren· Feb 2, 2024, 05:09 UTC · re: Philippe Blain via GitGitGadget · lore

Re: [PATCH] imap-send: add missing "strbuf.h" include under NO_CURL

On Thu, Feb 1, 2024 at 4:18 PM Philippe Blain via GitGitGadget <gitgitgadget@gmail.com> wrote:

Show 14 quoted lines

>
> From: Philippe Blain <levraiphilippeblain@gmail.com>
>
> Building with NO_CURL is currently broken since imap-send.c uses things
> defined in "strbuf.h" wihtout including it.
>
> The inclusion of that header was removed in eea0e59ffb (treewide: remove
> unnecessary includes in source files, 2023-12-23), which failed to
> notice that "strbuf.h" was transitively included in imap-send.c via
> "http.h", but only if USE_CURL_FOR_IMAP_SEND is defined. Add back the
> missing include. Note that it was explicitely added in 3307f7dde2
> (imap-send: include strbuf.h, 2023-05-17) after a similar breakage in
> ba3d1c73da (treewide: remove unnecessary cache.h includes, 2023-02-24) -
> see the thread starting at [1].

Ugh, sorry.

> It can be verified by inspection that this is the only case where a
> header we include is dependent on a Makefile knob in the files modified
> in eea0e59ffb.

Thanks for checking.

Show 29 quoted lines

> [1] https://lore.kernel.org/git/20230517070632.71884-1-list@eworm.de/
>
> Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
> ---
>     imap-send: add missing "strbuf.h" include under NO_CURL
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1664%2Fphil-blain%2Fimap-send-include-no-openssl-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1664/phil-blain/imap-send-include-no-openssl-v1
> Pull-Request: https://github.com/git/git/pull/1664
>
>  imap-send.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/imap-send.c b/imap-send.c
> index d662811ee83..f2e1947e638 100644
> --- a/imap-send.c
> +++ b/imap-send.c
> @@ -28,6 +28,7 @@
>  #include "run-command.h"
>  #include "parse-options.h"
>  #include "setup.h"
> +#include "strbuf.h"
>  #if defined(NO_OPENSSL) && !defined(HAVE_OPENSSL_CSPRNG)
>  typedef void *SSL;
>  #endif
>
> base-commit: bc7ee2e5e16f0d1e710ef8fab3db59ab11f2bbe7
> --
> gitgitgadget

Again, thanks for cleaning this up for me.

patchimap-send: add missing "strbuf.h" include under NO_CURL