From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com> To: git@vger.kernel.org Cc: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>, "Ramsay Jones" <ramsay@ramsayjones.plus.com>, "Johannes Schindelin" <Johannes.Schindelin@gmx.de>, "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net> Subject: [PATCH v3 2/4] compat/regex: move stdlib.h up in inclusion chain Date: Mon, 27 Apr 2020 21:22:35 +0700 [thread overview] Message-ID: <8d18c53bc813865a652be148afd2292d75e1b635.1587996766.git.congdanhqx@gmail.com> (raw) In-Reply-To: <cover.1587996765.git.congdanhqx@gmail.com> In Linux with musl libc, we have this inclusion chain: compat/regex/regex.c:69 `-> compat/regex/regex_internal.h `-> /usr/include/stdlib.h `-> /usr/include/features.h `-> /usr/include/alloca.h In that inclusion chain, `<features.h>` claims it's _BSD_SOURCE compatible when it's NOT asked to be either {_POSIX,_GNU,_XOPEN,_BSD}_SOURCE, or __STRICT_ANSI__. And, `<stdlib.h>` will include `<alloca.h>` to be compatible with software written for GNU and BSD. Thus, redefine `alloca` macro, which was defined before at compat/regex/regex.c:66. Considering this is only compat code, we've taken from other project, it's not our business to decide which source should we adhere to. Include `<stdlib.h>` early to prevent the redefinition of alloca. This also remove a potential warning about alloca not defined on: #undef alloca Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> --- Notes: There is another warning about un-match declaration and definition of re_string_context_at. It's arguably, a bug in sparse itself. Consider that there's a fix for it in their development version already, and, we expect they'll fix the zero-ing pattern in 1/? before enable it again. There're no point to change that pair of declaration/definition. This patch is technically Ramsay's work. Since <alloca.h> is likely unportable, my patch will be likely unusable. I took Ramsay's work and write the commit message instead. I would love to see Ramsay's SoB on reply to this patch. compat/regex/regex.c | 1 + compat/regex/regex_internal.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/regex/regex.c b/compat/regex/regex.c index f3e03a9eab..e6f4a5d177 100644 --- a/compat/regex/regex.c +++ b/compat/regex/regex.c @@ -60,6 +60,7 @@ #undefs RE_DUP_MAX and sets it to the right value. */ #include <limits.h> #include <stdint.h> +#include <stdlib.h> #ifdef GAWK #undef alloca diff --git a/compat/regex/regex_internal.h b/compat/regex/regex_internal.h index 3ee8aae59d..0bad8b841e 100644 --- a/compat/regex/regex_internal.h +++ b/compat/regex/regex_internal.h @@ -23,7 +23,6 @@ #include <assert.h> #include <ctype.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> #if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC -- 2.26.2.526.g744177e7f7
next prev parent reply other threads:[~2020-04-27 14:22 UTC|newest] Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-23 13:47 [PATCH 0/4] fix make sparse warning Đoàn Trần Công Danh 2020-04-23 13:47 ` [PATCH 1/4] C: s/0/NULL/ for pointer type Đoàn Trần Công Danh 2020-04-24 0:39 ` Ramsay Jones 2020-04-24 0:54 ` Junio C Hamano 2020-04-24 1:09 ` Danh Doan 2020-04-24 1:54 ` Junio C Hamano 2020-05-14 21:37 ` Luc Van Oostenryck 2020-04-23 13:47 ` [PATCH 2/4] compat/regex: silence `make sparse` warning Đoàn Trần Công Danh 2020-04-24 0:51 ` Ramsay Jones 2020-04-24 1:04 ` Danh Doan 2020-04-23 13:47 ` [PATCH 3/4] graph.c: limit linkage of internal variable Đoàn Trần Công Danh 2020-04-24 0:52 ` Ramsay Jones 2020-04-23 13:47 ` [PATCH 4/4] progress.c: silence cgcc suggestion about internal linkage Đoàn Trần Công Danh 2020-04-24 0:58 ` Ramsay Jones 2020-04-24 5:54 ` Jeff King 2020-04-23 13:47 ` [PATCH 5/4] fmt-merge-msg.c: fix `make sparse` on next Đoàn Trần Công Danh 2020-04-23 23:10 ` [PATCH 0/4] fix make sparse warning Ramsay Jones 2020-04-23 23:58 ` Danh Doan 2020-04-24 16:38 ` Ramsay Jones 2020-04-24 15:12 ` [PATCH v2 0/4] Fix Sparse Warning Đoàn Trần Công Danh 2020-04-24 15:12 ` [PATCH v2 1/4] test-parse-pathspec-file.c: s/0/NULL/ for pointer type Đoàn Trần Công Danh 2020-04-24 15:12 ` [PATCH v2 2/4] compat/regex: include alloca.h before undef it Đoàn Trần Công Danh 2020-04-24 16:56 ` Ramsay Jones 2020-04-24 17:09 ` Danh Doan 2020-04-24 18:29 ` Ramsay Jones 2020-04-24 22:34 ` Danh Doan 2020-04-25 20:28 ` Ramsay Jones 2020-04-26 0:54 ` Danh Doan 2020-04-26 1:10 ` Danh Doan 2020-04-26 16:17 ` Ramsay Jones 2020-04-26 19:38 ` Ramsay Jones 2020-04-26 22:37 ` Junio C Hamano 2020-04-27 1:08 ` Danh Doan 2020-04-27 16:28 ` Ramsay Jones 2020-04-27 16:46 ` Danh Doan 2020-04-27 17:21 ` Ramsay Jones 2020-04-24 15:12 ` [PATCH v2 3/4] graph.c: limit linkage of internal variable Đoàn Trần Công Danh 2020-04-24 15:12 ` [PATCH v2 4/4] progress.c: silence cgcc suggestion about internal linkage Đoàn Trần Công Danh 2020-04-24 16:40 ` [PATCH v2 0/4] Fix Sparse Warning Ramsay Jones 2020-04-25 13:13 ` [PATCH 0/4] fix make sparse warning Johannes Schindelin 2020-04-26 3:32 ` Danh Doan 2020-04-26 16:24 ` Ramsay Jones 2020-05-01 20:02 ` Johannes Schindelin 2020-04-27 14:22 ` [PATCH v3 0/4] Partial fix `make sparse` Đoàn Trần Công Danh 2020-04-27 14:22 ` [PATCH v3 1/4] test-parse-pathspec-file.c: s/0/NULL/ for pointer type Đoàn Trần Công Danh 2020-04-27 14:22 ` Đoàn Trần Công Danh [this message] 2020-04-27 16:41 ` [PATCH v3 2/4] compat/regex: move stdlib.h up in inclusion chain Ramsay Jones 2020-04-27 14:22 ` [PATCH v3 3/4] graph.c: limit linkage of internal variable Đoàn Trần Công Danh 2020-04-27 14:22 ` [PATCH v3 4/4] progress.c: silence cgcc suggestion about internal linkage Đoàn Trần Công Danh 2020-05-01 20:09 ` Johannes Schindelin 2020-04-27 16:35 ` [PATCH v3 0/4] Partial fix `make sparse` Ramsay Jones
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 * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=8d18c53bc813865a652be148afd2292d75e1b635.1587996766.git.congdanhqx@gmail.com \ --to=congdanhqx@gmail.com \ --cc=Johannes.Schindelin@gmx.de \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=peff@peff.net \ --cc=ramsay@ramsayjones.plus.com \ --subject='Re: [PATCH v3 2/4] compat/regex: move stdlib.h up in inclusion chain' \ /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
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).