From: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx>
Add extra set of braces around zero initialization of two array/structure
variables to resolve compiler errors/warnings from clang 11.0.0 on MacOS.
This is not needed on clang 14.0.
$ uname -a
Darwin jeffhost-mbp.local 19.6.0 Darwin Kernel Version 19.6.0: \
Mon Apr 18 21:50:40 PDT 2022; \
root:xnu-6153.141.62~1/RELEASE_X86_64 x86_64
$ clang -v
Apple clang version 11.0.0 (clang-1100.0.33.17)
Target: x86_64-apple-darwin19.6.0
[...]
$ make builtin/merge-file.o
CC builtin/merge-file.o
builtin/merge-file.c:29:23: error: suggest braces around initialization \
of subobject [-Werror,-Wmissing-braces]
mmfile_t mmfs[3] = { 0 };
^
{}
builtin/merge-file.c:31:20: error: suggest braces around initialization \
of subobject [-Werror,-Wmissing-braces]
xmparam_t xmp = { 0 };
^
{}
2 errors generated.
make: *** [builtin/merge-file.o] Error 1
Signed-off-by: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx>
---
builtin/merge-file.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index c923bbf2abb..607c3d3f9e1 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -26,9 +26,9 @@ static int label_cb(const struct option *opt, const char *arg, int unset)
int cmd_merge_file(int argc, const char **argv, const char *prefix)
{
const char *names[3] = { 0 };
- mmfile_t mmfs[3] = { 0 };
+ mmfile_t mmfs[3] = { { 0 } };
mmbuffer_t result = { 0 };
- xmparam_t xmp = { 0 };
+ xmparam_t xmp = { { 0 } };
int ret = 0, i = 0, to_stdout = 0;
int quiet = 0;
struct option options[] = {
--
gitgitgadget
