From: Christian Brauner Date: Sat, 22 Sep 2018 08:56:09 +0000 (+0200) Subject: compiler: s/__noreturn__/__noreturn/g X-Git-Tag: lxc-3.1.0~94^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=181a780fb66cc360a8fd0ef547354e8b9dd8a071;p=thirdparty%2Flxc.git compiler: s/__noreturn__/__noreturn/g Signed-off-by: Christian Brauner --- diff --git a/src/lxc/cmd/lxc_init.c b/src/lxc/cmd/lxc_init.c index 388b82173..c052fee80 100644 --- a/src/lxc/cmd/lxc_init.c +++ b/src/lxc/cmd/lxc_init.c @@ -467,7 +467,7 @@ out: exit(exit_with); } -__noreturn__ static void print_usage_exit(const struct option longopts[]) +__noreturn static void print_usage_exit(const struct option longopts[]) { fprintf(stderr, "Usage: lxc-init [-n|--name=NAME] [-h|--help] [--usage] [--version]\n\ @@ -475,7 +475,7 @@ __noreturn__ static void print_usage_exit(const struct option longopts[]) exit(0); } -__noreturn__ static void print_version_exit(void) +__noreturn static void print_version_exit(void) { printf("%s\n", LXC_VERSION); exit(0); diff --git a/src/lxc/compiler.h b/src/lxc/compiler.h index c76b9317e..bbb99d8e3 100644 --- a/src/lxc/compiler.h +++ b/src/lxc/compiler.h @@ -40,9 +40,9 @@ #ifndef _noreturn_ #if __STDC_VERSION__ >= 201112L -#define __noreturn__ _Noreturn +#define __noreturn _Noreturn #else -#define __noreturn__ __attribute__((noreturn)) +#define __noreturn __attribute__((noreturn)) #endif #endif diff --git a/src/lxc/tools/arguments.c b/src/lxc/tools/arguments.c index e1e4c6e49..b47df0ecb 100644 --- a/src/lxc/tools/arguments.c +++ b/src/lxc/tools/arguments.c @@ -88,7 +88,7 @@ is2big: return -1; } -__noreturn__ static void print_usage_exit(const struct option longopts[], +__noreturn static void print_usage_exit(const struct option longopts[], const struct lxc_arguments *a_args) { @@ -135,13 +135,13 @@ __noreturn__ static void print_usage_exit(const struct option longopts[], exit(0); } -__noreturn__ static void print_version_exit() +__noreturn static void print_version_exit() { printf("%s\n", lxc_get_version()); exit(0); } -__noreturn__ static void print_help_exit(const struct lxc_arguments *args, +__noreturn static void print_help_exit(const struct lxc_arguments *args, int code) { fprintf(stderr, "\