From 0dc6f9d6e2d77e4ffa20a3afcf31463db52ec570 Mon Sep 17 00:00:00 2001
From: reyk <>
Date: Sat, 19 Dec 2015 20:44:35 +0000
Subject: [PATCH] No need for an extra log.h

OK bcook@
---
 src/usr.sbin/ntpd/log.h  | 37 -------------------------------------
 src/usr.sbin/ntpd/ntpd.h | 26 +++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 40 deletions(-)
 delete mode 100644 src/usr.sbin/ntpd/log.h

diff --git a/src/usr.sbin/ntpd/log.h b/src/usr.sbin/ntpd/log.h
deleted file mode 100644
index 4afaf164..00000000
--- a/src/usr.sbin/ntpd/log.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$OpenBSD: log.h,v 1.3 2015/12/19 17:55:29 reyk Exp $	*/
-
-/*
- * Copyright (c) 2010 Gilles Chehade <gilles@poolp.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-void	log_init(int, int);
-void	log_procinit(const char *);
-void	log_verbose(int);
-void	log_warn(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-void	log_warnx(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-void	log_info(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-void	log_debug(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-void	logit(int, const char *, ...)
-	    __attribute__((__format__ (printf, 2, 3)));
-void	vlog(int, const char *, va_list)
-	    __attribute__((__format__ (printf, 2, 0)));
-__dead void fatal(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-__dead void fatalx(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
index af2ad9e4..b950634c 100644
--- a/src/usr.sbin/ntpd/ntpd.h
+++ b/src/usr.sbin/ntpd/ntpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntpd.h,v 1.126 2015/12/19 13:58:08 reyk Exp $ */
+/*	$OpenBSD: ntpd.h,v 1.127 2015/12/19 20:44:35 reyk Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -29,10 +29,9 @@
 #include <pwd.h>
 #include <stdarg.h>
 #include <poll.h>
+#include <imsg.h>
 
-#include "log.h"
 #include "ntp.h"
-#include <imsg.h>
 
 #define MAXIMUM(a, b)	((a) > (b) ? (a) : (b))
 
@@ -398,3 +397,24 @@ void			 build_show_peer(struct ctl_show_peer *,
 			     struct ntp_peer *);
 void			 build_show_sensor(struct ctl_show_sensor *,
 			     struct ntp_sensor *);
+
+/* log.c */
+void	log_init(int, int);
+void	log_procinit(const char *);
+void	log_verbose(int);
+void	log_warn(const char *, ...)
+	    __attribute__((__format__ (printf, 1, 2)));
+void	log_warnx(const char *, ...)
+	    __attribute__((__format__ (printf, 1, 2)));
+void	log_info(const char *, ...)
+	    __attribute__((__format__ (printf, 1, 2)));
+void	log_debug(const char *, ...)
+	    __attribute__((__format__ (printf, 1, 2)));
+void	logit(int, const char *, ...)
+	    __attribute__((__format__ (printf, 2, 3)));
+void	vlog(int, const char *, va_list)
+	    __attribute__((__format__ (printf, 2, 0)));
+__dead void fatal(const char *, ...)
+	    __attribute__((__format__ (printf, 1, 2)));
+__dead void fatalx(const char *, ...)
+	    __attribute__((__format__ (printf, 1, 2)));