From 3c4c8f785cb3c4763227a55f0408a721b263c08c Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Tue, 23 Jan 2018 11:40:29 +0100 Subject: [PATCH] Oops, fix up my previous commit properly. --- contrib/ncurses/ncurses/curses.priv.h | 4 ++-- libexec/dma/net.c | 2 +- usr.sbin/nscd/hashtable.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/ncurses/ncurses/curses.priv.h b/contrib/ncurses/ncurses/curses.priv.h index c75c8f7261..d9227af960 100644 --- a/contrib/ncurses/ncurses/curses.priv.h +++ b/contrib/ncurses/ncurses/curses.priv.h @@ -1553,10 +1553,10 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; * tries to limp along after a failure. */ #define TYPE_MALLOC(type, size, name) \ - do { + do { \ name = typeMalloc(type, size); \ if (name == 0) \ - _nc_err_abort(MSG_NO_MEMORY) \ + _nc_err_abort(MSG_NO_MEMORY); \ } while (0) #define TYPE_REALLOC(type, size, name) \ diff --git a/libexec/dma/net.c b/libexec/dma/net.c index 43b103b082..d0a9ba5221 100644 --- a/libexec/dma/net.c +++ b/libexec/dma/net.c @@ -379,7 +379,7 @@ deliver_to_host(struct qitem *it, struct mx_hostentry *host) host->host, host->addr, c, neterr); \ return (1); \ } \ - while (0) + } while (0) /* Check first reply from remote host */ if ((config.features & SECURETRANS) == 0 || diff --git a/usr.sbin/nscd/hashtable.h b/usr.sbin/nscd/hashtable.h index 682db86741..698ee52868 100644 --- a/usr.sbin/nscd/hashtable.h +++ b/usr.sbin/nscd/hashtable.h @@ -132,7 +132,7 @@ typedef int hashtable_index_t; (entry)->field.capacity *= 2; \ (entry)->field.values = (type *)realloc((entry)->field.values, \ (entry)->field.capacity * sizeof(type)); \ - while (0) + } while (0) #define HASHTABLE_ENTRY_CAPACITY_DECREASE(entry, field, type) \ (entry)->field.capacity /= 2; \ -- 2.41.0