From cbb7f9fc28abffd18642b83eeb8fe22e8931540f Mon Sep 17 00:00:00 2001
From: Omar Polo <op@omarpolo.com>
Date: Thu, 8 Jun 2023 17:03:13 +0000
Subject: [PATCH] move logger() prototype to gmid.h and delete logger.h

---
 Makefile |  6 +++---
 gmid.h   |  3 +++
 logger.h | 17 -----------------
 3 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 logger.h

diff --git a/Makefile b/Makefile
index 2b46883..6872ae7 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ GG_SRCS =	gg.c iri.c utf8.c
 
 GG_OBJS =	${GG_SRCS:.c=.o} ${COBJS}
 
-SRCS =		gmid.h log.h logger.h parse.y proc.h \
+SRCS =		gmid.h log.h parse.y proc.h \
 		${GMID_SRCS} ${GE_SRCS} ${GG_SRCS}
 
 DISTNAME =	gmid-${VERSION}
@@ -111,8 +111,8 @@ uninstall:
 DISTFILES =	.cirrus.yml .dockerignore .gitignore ChangeLog LICENSE \
 		Makefile README.md config.c configure configure.local.example \
 		dirs.c fcgi.c ge.1 ge.c gg.1 gg.c gmid.8 gmid.c gmid.conf.5 \
-		gmid.h iri.c log.c log.h logger.c logger.h mime.c parse.y \
-		proxy.c puny.c sandbox.c server.c utf8.c utils.c y.tab.c
+		gmid.h iri.c log.c log.h logger.c mime.c parse.y proxy.c \
+		puny.c sandbox.c server.c utf8.c utils.c y.tab.c
 
 dist: ${DISTNAME}.sha256
 
diff --git a/gmid.h b/gmid.h
index 2078a2c..4001c72 100644
--- a/gmid.h
+++ b/gmid.h
@@ -404,6 +404,9 @@ int		 serialize_iri(struct iri*, char*, size_t);
 int		 encode_path(char *, size_t, const char *);
 char		*pct_decode_str(char *);
 
+/* logger.h */
+void		 logger(struct privsep *, struct privsep_proc *);
+
 /* proxy.c */
 int		 proxy_init(struct client *);
 
diff --git a/logger.h b/logger.h
deleted file mode 100644
index 59b92bc..0000000
--- a/logger.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2023 Omar Polo <op@omarpolo.com>
- *
- * 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		 logger(struct privsep *, struct privsep_proc *);