diff options
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | html.h | 6 | ||||
| -rw-r--r-- | libmandoc.h | 6 | ||||
| -rw-r--r-- | main.c | 6 | ||||
| -rw-r--r-- | mandoc_aux.h | 3 | ||||
| -rw-r--r-- | mandocdb.c | 7 | ||||
| -rw-r--r-- | term_ps.c | 6 |
7 files changed, 15 insertions, 27 deletions
@@ -285,8 +285,9 @@ cat << __HEREDOC__ #error "Do not use C++. See the INSTALL file." #endif -#ifndef MANDOC_CONFIG_H -#define MANDOC_CONFIG_H +#if !defined(__GNUC__) || (__GNUC__ < 4) +#define __attribute__(x) +#endif #if defined(__linux__) || defined(__MINT__) #define _GNU_SOURCE /* See test-*.c what needs this. */ @@ -391,9 +392,6 @@ fi [ ${HAVE_VASPRINTF} -eq 0 ] && \ echo "extern int vasprintf(char **, const char *, va_list);" -echo -echo "#endif /* MANDOC_CONFIG_H */" - echo "config.h: written" 1>&2 echo "config.h: written" 1>&3 @@ -158,10 +158,8 @@ void print_tbl(struct html *, const struct tbl_span *); void print_eqn(struct html *, const struct eqn *); void print_paragraph(struct html *); -#if __GNUC__ - 0 >= 4 -__attribute__((__format__ (__printf__, 2, 3))) -#endif -void bufcat_fmt(struct html *, const char *, ...); +void bufcat_fmt(struct html *, const char *, ...) + __attribute__((__format__ (printf, 2, 3))); void bufcat(struct html *, const char *); void bufcat_id(struct html *, const char *); void bufcat_style(struct html *, diff --git a/libmandoc.h b/libmandoc.h index c00679fd..2003ec63 100644 --- a/libmandoc.h +++ b/libmandoc.h @@ -41,11 +41,9 @@ struct roff_man; void mandoc_msg(enum mandocerr, struct mparse *, int, int, const char *); -#if __GNUC__ - 0 >= 4 -__attribute__((__format__ (__printf__, 5, 6))) -#endif void mandoc_vmsg(enum mandocerr, struct mparse *, - int, int, const char *, ...); + int, int, const char *, ...) + __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); @@ -51,12 +51,6 @@ #include "manconf.h" #include "mansearch.h" -#if !defined(__GNUC__) || (__GNUC__ < 2) -# if !defined(lint) -# define __attribute__(x) -# endif -#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ - enum outmode { OUTMODE_DEF = 0, OUTMODE_FLN, diff --git a/mandoc_aux.h b/mandoc_aux.h index feb84994..b6a70ae9 100644 --- a/mandoc_aux.h +++ b/mandoc_aux.h @@ -16,7 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -int mandoc_asprintf(char **, const char *, ...); +int mandoc_asprintf(char **, const char *, ...) + __attribute__((__format__ (printf, 2, 3))); void *mandoc_calloc(size_t, size_t); void *mandoc_malloc(size_t); void *mandoc_realloc(void *, size_t); @@ -185,7 +185,8 @@ static void putkeys(const struct mpage *, char *, size_t, uint64_t); static void putmdockey(const struct mpage *, const struct roff_node *, uint64_t); static int render_string(char **, size_t *); -static void say(const char *, const char *, ...); +static void say(const char *, const char *, ...) + __attribute__((__format__ (printf, 2, 3))); static int set_basedir(const char *, int); static int treescan(void); static size_t utf8(unsigned int, char [7]); @@ -1818,7 +1819,7 @@ putkeys(const struct mpage *mpage, char *cp, size_t sz, uint64_t v) name_mask &= ~NAME_FIRST; if (debug > 1) say(mpage->mlinks->file, - "Adding name %*s, bits=%d", sz, cp, v); + "Adding name %*s, bits=0x%llu", (int)sz, cp, v); } else { htab = &strings; if (debug > 1) @@ -1826,7 +1827,7 @@ putkeys(const struct mpage *mpage, char *cp, size_t sz, uint64_t v) if ((uint64_t)1 << i & v) say(mpage->mlinks->file, "Adding key %s=%*s", - mansearch_keynames[i], sz, cp); + mansearch_keynames[i], (int)sz, cp); } end = cp + sz; @@ -103,10 +103,8 @@ static void ps_growbuf(struct termp *, size_t); static void ps_letter(struct termp *, int); static void ps_pclose(struct termp *); static void ps_pletter(struct termp *, int); -#if __GNUC__ - 0 >= 4 -__attribute__((__format__ (__printf__, 2, 3))) -#endif -static void ps_printf(struct termp *, const char *, ...); +static void ps_printf(struct termp *, const char *, ...) + __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); |