aboutsummaryrefslogtreecommitdiffstats
path: root/src/mds-kbdc
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2014-12-09 12:56:12 +0100
committerMattias Andrée <maandree@operamail.com>2014-12-09 12:56:12 +0100
commit6a46e971b3904a969fe131afd32bbf570e512ee3 (patch)
tree8aac5b214933740ad05dc9886af8c60a91aaef1b /src/mds-kbdc
parentmake sure errno is not changed during fail_if (diff)
downloadmds-6a46e971b3904a969fe131afd32bbf570e512ee3.tar.gz
mds-6a46e971b3904a969fe131afd32bbf570e512ee3.tar.bz2
mds-6a46e971b3904a969fe131afd32bbf570e512ee3.tar.xz
missed to change some parts
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src/mds-kbdc')
-rw-r--r--src/mds-kbdc/compile-layout.c5
1 files changed, 3 insertions, 2 deletions
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