>From cfb452979005ce5b7c006c290880c0df09a99003 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Thu, 3 Mar 2016 09:31:32 +1300 Subject: [PATCH 1/2] regtree: avoid GCC indentation warning This was not actually a bug, but GCC6 (sort of reasonably) thought it could be. Signed-off-by: Douglas Bagnall --- source4/lib/registry/tools/regtree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c index 6df8e50..56f38e7 100644 --- a/source4/lib/registry/tools/regtree.c +++ b/source4/lib/registry/tools/regtree.c @@ -46,7 +46,8 @@ static void print_tree(unsigned int level, struct registry_key *p, unsigned int i; TALLOC_CTX *mem_ctx; - for(i = 0; i < level; i++) putchar(' '); puts(name); + for(i = 0; i < level; i++) putchar(' '); + puts(name); mem_ctx = talloc_init("print_tree"); for (i = 0; W_ERROR_IS_OK(error = reg_key_get_subkey_by_index(mem_ctx, -- 2.5.0 >From b5372328c3b9f50ab732b895009fb3cc62740ed1 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Thu, 3 Mar 2016 09:33:38 +1300 Subject: [PATCH 2/2] heimdal asn1: avoid fclose(NULL) caused by missing braces Thanks to GCC6 -Wmisleading-indentation. Signed-off-by: Douglas Bagnall --- source4/heimdal/lib/asn1/gen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source4/heimdal/lib/asn1/gen.c b/source4/heimdal/lib/asn1/gen.c index 2194b32..fd833db 100644 --- a/source4/heimdal/lib/asn1/gen.c +++ b/source4/heimdal/lib/asn1/gen.c @@ -290,9 +290,10 @@ close_generate (void) fclose (privheaderfile); if (templatefile) fclose (templatefile); - if (logfile) + if (logfile) { fprintf (logfile, "\n"); fclose (logfile); + } } void -- 2.5.0