From 6a46e971b3904a969fe131afd32bbf570e512ee3 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 9 Dec 2014 12:56:12 +0100 Subject: missed to change some parts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/mds-kbdc/compile-layout.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/mds-kbdc') diff --git a/src/mds-kbdc/compile-layout.c b/src/mds-kbdc/compile-layout.c index 539ade3..0df48eb 100644 --- a/src/mds-kbdc/compile-layout.c +++ b/src/mds-kbdc/compile-layout.c @@ -2500,10 +2500,9 @@ static int compile_macro_call(mds_kbdc_tree_macro_call_t* restrict tree) */ static int compile_subtree(mds_kbdc_tree_t* restrict tree) { -#define t(expr) if (r = (expr), r < 0) return r +#define t(expr) fail_if ((expr) < 0) #define c(type) t (compile_##type(&(tree->type))) #define c_(type) t (compile_##type(&(tree->type##_))) - int r; again: if (tree == NULL) return 0; @@ -2554,6 +2553,8 @@ static int compile_subtree(mds_kbdc_tree_t* restrict tree) tree = tree->next; goto again; + fail: + return -1; #undef c_ #undef c #undef t -- cgit v1.2.3-70-g09d2