From b0612ba1f799bc301c97e7536aa575b935da1d33 Mon Sep 17 00:00:00 2001 From: martijn Date: Wed, 19 Jan 2022 10:19:27 +0000 Subject: [PATCH] Move log.c functions to their own header. This is needed for a new application layer where, where a lot of the snmpd.h stuff just clutter. Requested by benno@ OK jmatthew@ tested as part of larger diff by sthen@ and Joel Carnat --- usr.sbin/snmpd/log.h | 40 ++++++++++++++++++++++++++++++++++++++++ usr.sbin/snmpd/snmpd.h | 25 ++----------------------- 2 files changed, 42 insertions(+), 23 deletions(-) create mode 100644 usr.sbin/snmpd/log.h diff --git a/usr.sbin/snmpd/log.h b/usr.sbin/snmpd/log.h new file mode 100644 index 00000000000..f95084d3f3d --- /dev/null +++ b/usr.sbin/snmpd/log.h @@ -0,0 +1,40 @@ +/* $OpenBSD: log.h,v 1.1 2022/01/19 10:19:27 martijn Exp $ */ + +/* + * Copyright (c) 2003, 2004 Henning Brauer + * + * 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. + */ + +#include + +void log_init(int, int); +void log_procinit(const char *); +void log_setverbose(int); +int log_getverbose(void); +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/usr.sbin/snmpd/snmpd.h b/usr.sbin/snmpd/snmpd.h index 778f5eca6b3..3ed39b3a9b7 100644 --- a/usr.sbin/snmpd/snmpd.h +++ b/usr.sbin/snmpd/snmpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: snmpd.h,v 1.100 2021/09/02 05:41:02 martijn Exp $ */ +/* $OpenBSD: snmpd.h,v 1.101 2022/01/19 10:19:27 martijn Exp $ */ /* * Copyright (c) 2007, 2008, 2012 Reyk Floeter @@ -35,6 +35,7 @@ #include #include +#include "log.h" #include "snmp.h" #ifndef nitems @@ -617,28 +618,6 @@ extern struct snmpd *snmpd_env; struct snmpd *parse_config(const char *, u_int); int cmdline_symset(char *); -/* log.c */ -void log_init(int, int); -void log_procinit(const char *); -void log_setverbose(int); -int log_getverbose(void); -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))); - /* kroute.c */ void kr_init(void); void kr_shutdown(void); -- 2.20.1