aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2014-12-09 04:16:41 +0100
committerMattias Andrée <maandree@operamail.com>2014-12-09 04:16:55 +0100
commitfe75aa51cd8c5acfa66d9506e5acc44f5630b753 (patch)
treede3b2c7b565c0060bd27dc2439bd52d6a0b15f37
parentmake fail_if friendlier to complex if-statements (diff)
downloadmds-fe75aa51cd8c5acfa66d9506e5acc44f5630b753.tar.gz
mds-fe75aa51cd8c5acfa66d9506e5acc44f5630b753.tar.bz2
mds-fe75aa51cd8c5acfa66d9506e5acc44f5630b753.tar.xz
make exit_if easier on the syntax
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
-rw-r--r--src/libmdsserver/macros.h2
-rw-r--r--src/mds-base.c8
2 files changed, 4 insertions, 6 deletions
diff --git a/src/libmdsserver/macros.h b/src/libmdsserver/macros.h
index 5329298..10ae2af 100644
--- a/src/libmdsserver/macros.h
+++ b/src/libmdsserver/macros.h
@@ -400,7 +400,7 @@
* @param condition The condition
* @param instructions The instruction (semicolon-terminated)
*/
-#define exit_if(condition, instructions) if (condition) do { instructions return 1; } while (0)
+#define exit_if(condition, instructions) do { if (condition) { instructions return 1; } } while (0)
/**
diff --git a/src/mds-base.c b/src/mds-base.c
index 85f0ef7..9b2db1a 100644
--- a/src/mds-base.c
+++ b/src/mds-base.c
@@ -156,11 +156,9 @@ int __attribute__((weak)) parse_cmdline(void)
/* Check that mandatory arguments have been specified. */
if (server_characteristics.require_respawn_info)
- {
- exit_if (is_respawn < 0,
- eprintf("missing state argument, require either %s or %s.",
- "--initial-spawn", "--respawn"););
- }
+ exit_if (is_respawn < 0,
+ eprintf("missing state argument, require either %s or %s.",
+ "--initial-spawn", "--respawn"););
return 0;
}