From 0d80df65359b9d2c8098f97712722f3889143c77 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 17 Feb 2017 14:31:52 +0000 Subject: Be consistent in protecting __attribute__ attributes with __; from Christos Zoulas . --- catman.c | 6 +++--- libmandoc.h | 4 ++-- main.c | 4 ++-- mandoc_aux.h | 4 ++-- mandocd.c | 4 ++-- mandocdb.c | 4 ++-- tag.c | 4 ++-- term_ps.c | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/catman.c b/catman.c index 3cfb1038..5c5bd7f8 100644 --- a/catman.c +++ b/catman.c @@ -1,4 +1,4 @@ -/* $Id: catman.c,v 1.19 2017/02/16 15:12:32 schwarze Exp $ */ +/* $Id: catman.c,v 1.20 2017/02/17 14:31:52 schwarze Exp $ */ /* * Copyright (c) 2017 Michael Stapelberg * Copyright (c) 2017 Ingo Schwarze @@ -48,9 +48,9 @@ int process_manpage(int, int, const char *); int process_tree(int, int); void run_mandocd(int, const char *, const char *) - __attribute__((noreturn)); + __attribute__((__noreturn__)); ssize_t sock_fd_write(int, int, int, int); -void usage(void) __attribute__((noreturn)); +void usage(void) __attribute__((__noreturn__)); void diff --git a/libmandoc.h b/libmandoc.h index 96e726cb..f733a182 100644 --- a/libmandoc.h +++ b/libmandoc.h @@ -1,4 +1,4 @@ -/* $Id: libmandoc.h,v 1.64 2016/07/19 13:36:13 schwarze Exp $ */ +/* $Id: libmandoc.h,v 1.65 2017/02/17 14:31:52 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons * Copyright (c) 2013, 2014, 2015 Ingo Schwarze @@ -43,7 +43,7 @@ void mandoc_msg(enum mandocerr, struct mparse *, int, int, const char *); void mandoc_vmsg(enum mandocerr, struct mparse *, int, int, const char *, ...) - __attribute__((__format__ (printf, 5, 6))); + __attribute__((__format__ (__printf__, 5, 6))); char *mandoc_getarg(struct mparse *, char **, int, int *); char *mandoc_normdate(struct mparse *, char *, int, int); int mandoc_eos(const char *, size_t); diff --git a/main.c b/main.c index 613bae76..02abaaf7 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.282 2017/02/16 10:56:07 schwarze Exp $ */ +/* $Id: main.c,v 1.283 2017/02/17 14:31:52 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010-2012, 2014-2017 Ingo Schwarze @@ -100,7 +100,7 @@ static void parse(struct curparse *, int, const char *); static void passthrough(const char *, int, int); static pid_t spawn_pager(struct tag_files *); static int toptions(struct curparse *, char *); -static void usage(enum argmode) __attribute__((noreturn)); +static void usage(enum argmode) __attribute__((__noreturn__)); static int woptions(struct curparse *, char *); static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9}; diff --git a/mandoc_aux.h b/mandoc_aux.h index 603cc5a7..a2425066 100644 --- a/mandoc_aux.h +++ b/mandoc_aux.h @@ -1,4 +1,4 @@ -/* $Id: mandoc_aux.h,v 1.5 2016/07/19 13:36:13 schwarze Exp $ */ +/* $Id: mandoc_aux.h,v 1.6 2017/02/17 14:31:52 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons * Copyright (c) 2014 Ingo Schwarze @@ -17,7 +17,7 @@ */ int mandoc_asprintf(char **, const char *, ...) - __attribute__((__format__ (printf, 2, 3))); + __attribute__((__format__ (__printf__, 2, 3))); void *mandoc_calloc(size_t, size_t); void *mandoc_malloc(size_t); void *mandoc_realloc(void *, size_t); diff --git a/mandocd.c b/mandocd.c index b8a2b6dc..2f6046b7 100644 --- a/mandocd.c +++ b/mandocd.c @@ -1,4 +1,4 @@ -/* $Id: mandocd.c,v 1.4 2017/02/08 16:11:41 schwarze Exp $ */ +/* $Id: mandocd.c,v 1.5 2017/02/17 14:31:52 schwarze Exp $ */ /* * Copyright (c) 2017 Michael Stapelberg * Copyright (c) 2017 Ingo Schwarze @@ -49,7 +49,7 @@ enum outt { static void process(struct mparse *, enum outt, void *); static int read_fds(int, int *); -static void usage(void) __attribute__((noreturn)); +static void usage(void) __attribute__((__noreturn__)); #define NUM_FDS 3 diff --git a/mandocdb.c b/mandocdb.c index dcfa43bd..af97019f 100644 --- a/mandocdb.c +++ b/mandocdb.c @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.242 2017/01/27 11:33:26 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.243 2017/02/17 14:31:52 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2011-2017 Ingo Schwarze @@ -162,7 +162,7 @@ static void putmdockey(const struct mpage *, const struct roff_node *, uint64_t, int); static int render_string(char **, size_t *); static void say(const char *, const char *, ...) - __attribute__((__format__ (printf, 2, 3))); + __attribute__((__format__ (__printf__, 2, 3))); static int set_basedir(const char *, int); static int treescan(void); static size_t utf8(unsigned int, char [7]); diff --git a/tag.c b/tag.c index 0fbd2e10..21ac6b32 100644 --- a/tag.c +++ b/tag.c @@ -1,4 +1,4 @@ -/* $Id: tag.c,v 1.17 2017/01/09 17:49:58 schwarze Exp $ */ +/* $Id: tag.c,v 1.18 2017/02/17 14:31:52 schwarze Exp $ */ /* * Copyright (c) 2015, 2016 Ingo Schwarze * @@ -38,7 +38,7 @@ struct tag_entry { char s[]; }; -static void tag_signal(int) __attribute__((noreturn)); +static void tag_signal(int) __attribute__((__noreturn__)); static struct ohash tag_data; static struct tag_files tag_files; diff --git a/term_ps.c b/term_ps.c index 286a89f9..696ff224 100644 --- a/term_ps.c +++ b/term_ps.c @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.82 2016/08/10 11:03:43 schwarze Exp $ */ +/* $Id: term_ps.c,v 1.83 2017/02/17 14:31:52 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons * Copyright (c) 2014, 2015, 2016 Ingo Schwarze @@ -104,7 +104,7 @@ static void ps_pclose(struct termp *); static void ps_plast(struct termp *); static void ps_pletter(struct termp *, int); static void ps_printf(struct termp *, const char *, ...) - __attribute__((__format__ (printf, 2, 3))); + __attribute__((__format__ (__printf__, 2, 3))); static void ps_putchar(struct termp *, char); static void ps_setfont(struct termp *, enum termfont); static void ps_setwidth(struct termp *, int, int); -- cgit v1.2.3