remove unused iobuf helpers

2 files changed, 2 insertions, 30 deletions

diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index 2dec65f569f..9bfcfe93360 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd.h,v 1.526 2016/11/30 11:52:48 eric Exp $	*/
+/*	$OpenBSD: smtpd.h,v 1.527 2016/11/30 18:38:32 eric Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -27,7 +27,6 @@
 #include "smtpd-defines.h"
 #include "smtpd-api.h"
 #include "ioev.h"
-#include "iobuf.h"
 
 #include "rfc2822.h"
 
@@ -1495,8 +1494,6 @@ void *xcalloc(size_t, size_t, const char *);
 char *xstrdup(const char *, const char *);
 void *xmemdup(const void *, size_t, const char *);
 char *strip(char *);
-void iobuf_xinit(struct iobuf *, size_t, size_t, const char *);
-void iobuf_xfqueue(struct iobuf *, const char *, const char *, ...);
 int io_xprint(struct io *, const char *);
 int io_xprintf(struct io *, const char *, ...);
 void log_envelope(const struct envelope *, const char *, const char *,
diff --git a/usr.sbin/smtpd/util.c b/usr.sbin/smtpd/util.c
index 7c87019d7ad..cee21ddd6ac 100644
--- a/usr.sbin/smtpd/util.c
+++ b/usr.sbin/smtpd/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.129 2016/11/17 17:34:55 eric Exp $	*/
+/*	$OpenBSD: util.c,v 1.130 2016/11/30 18:38:32 eric Exp $	*/
 
 /*
  * Copyright (c) 2000,2001 Markus Friedl.  All rights reserved.
@@ -109,31 +109,6 @@ xmemdup(const void *ptr, size_t size, const char *where)
 }
 
 #if !defined(NO_IO)
-void
-iobuf_xinit(struct iobuf *io, size_t size, size_t max, const char *where)
-{
-	if (iobuf_init(io, size, max) == -1) {
-		log_warnx("%s: iobuf_init(%p, %zu, %zu)", where, io, size, max);
-		fatalx("exiting");
-	}
-}
-
-void
-iobuf_xfqueue(struct iobuf *io, const char *where, const char *fmt, ...)
-{
-	va_list	ap;
-	int	len;
-
-	va_start(ap, fmt);
-	len = iobuf_vfqueue(io, fmt, ap);
-	va_end(ap);
-
-	if (len == -1) {
-		log_warnx("%s: iobuf_xfqueue(%p, %s, ...)", where, io, fmt);
-		fatalx("exiting");
-	}
-}
-
 int
 io_xprintf(struct io *io, const char *fmt, ...)
 {