There is a bunch of programs that define IMSG_DATA_SIZE() themselves in a similar fashion. This patch reduces code duplication a bit. --- lib/libutil/imsg.h | 1 + sbin/iked/iked.h | 1 - usr.sbin/httpd/httpd.h | 1 - usr.sbin/relayd/relayd.h | 1 - usr.sbin/snmpd/snmpd.h | 1 - usr.sbin/vmd/proc.h | 1 - 6 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/lib/libutil/imsg.h b/lib/libutil/imsg.h index 8bf9414789b..8436e157b38 100644 --- a/lib/libutil/imsg.h +++ b/lib/libutil/imsg.h @@ -23,6 +23,7 @@ #define IBUF_READ_SIZE 65535 #define IMSG_HEADER_SIZE sizeof(struct imsg_hdr) +#define IMSG_DATA_SIZE(imsg) ((imsg)->hdr.len - IMSG_HEADER_SIZE) #define MAX_IMSGSIZE 16384 struct ibuf { diff --git a/sbin/iked/iked.h b/sbin/iked/iked.h index b536d58e157..dd10990118a 100644 --- a/sbin/iked/iked.h +++ b/sbin/iked/iked.h @@ -64,7 +64,6 @@ struct imsgev { if (IMSG_DATA_SIZE(imsg) < sizeof(*p)) \ fatalx("bad length imsg received"); \ } while (0) -#define IMSG_DATA_SIZE(imsg) ((imsg)->hdr.len - IMSG_HEADER_SIZE) #define IKED_ADDR_EQ(_a, _b) \ ((_a)->addr_mask == (_b)->addr_mask && \ diff --git a/usr.sbin/httpd/httpd.h b/usr.sbin/httpd/httpd.h index 05cbb8e3550..c9c1f929c27 100644 --- a/usr.sbin/httpd/httpd.h +++ b/usr.sbin/httpd/httpd.h @@ -191,7 +191,6 @@ struct imsgev { if (IMSG_DATA_SIZE(imsg) < sizeof(*p)) \ fatalx("bad length imsg received"); \ } while (0) -#define IMSG_DATA_SIZE(imsg) ((imsg)->hdr.len - IMSG_HEADER_SIZE) #define MAX_IMSG_DATA_SIZE (MAX_IMSGSIZE - IMSG_HEADER_SIZE) struct ctl_conn { diff --git a/usr.sbin/relayd/relayd.h b/usr.sbin/relayd/relayd.h index 6d1ed6e1b0a..5c2a33c20f8 100644 --- a/usr.sbin/relayd/relayd.h +++ b/usr.sbin/relayd/relayd.h @@ -889,7 +889,6 @@ struct imsgev { if (IMSG_DATA_SIZE(imsg) < sizeof(*p)) \ fatalx("bad length imsg received"); \ } while (0) -#define IMSG_DATA_SIZE(imsg) ((imsg)->hdr.len - IMSG_HEADER_SIZE) struct ctl_conn { TAILQ_ENTRY(ctl_conn) entry; diff --git a/usr.sbin/snmpd/snmpd.h b/usr.sbin/snmpd/snmpd.h index b4e15bbbec1..0a8c9c50070 100644 --- a/usr.sbin/snmpd/snmpd.h +++ b/usr.sbin/snmpd/snmpd.h @@ -105,7 +105,6 @@ struct imsgev { if (IMSG_DATA_SIZE(imsg) < sizeof(*p)) \ fatalx("bad length imsg received"); \ } while (0) -#define IMSG_DATA_SIZE(imsg) ((imsg)->hdr.len - IMSG_HEADER_SIZE) /* initially control.h */ struct control_sock { diff --git a/usr.sbin/vmd/proc.h b/usr.sbin/vmd/proc.h index b91f3a5fecb..48ac5736f5b 100644 --- a/usr.sbin/vmd/proc.h +++ b/usr.sbin/vmd/proc.h @@ -52,7 +52,6 @@ struct imsgev { if (IMSG_DATA_SIZE(imsg) < sizeof(*p)) \ fatalx("bad length imsg received (%s)", #p); \ } while (0) -#define IMSG_DATA_SIZE(imsg) ((imsg)->hdr.len - IMSG_HEADER_SIZE) /* control socket */ struct control_sock { -- 2.13.3