From a1c2f0445364e712c978233b4527530e0143256c Mon Sep 17 00:00:00 2001 From: Philipp Schafft Date: Fri, 15 Apr 2022 12:31:19 +0000 Subject: [PATCH] Cleanup: Merged event_*.h into event.h --- src/Makefile.am | 3 --- src/event.c | 3 --- src/event.h | 5 +++++ src/event_exec.h | 14 -------------- src/event_log.h | 14 -------------- src/event_url.h | 14 -------------- 6 files changed, 5 insertions(+), 48 deletions(-) delete mode 100644 src/event_exec.h delete mode 100644 src/event_log.h delete mode 100644 src/event_url.h diff --git a/src/Makefile.am b/src/Makefile.am index 04f9bc49..1ca5dddb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,9 +43,6 @@ noinst_HEADERS = \ fastevent.h \ navigation.h \ event.h \ - event_log.h \ - event_exec.h \ - event_url.h \ acl.h auth.h \ metadata_xiph.h \ format.h \ diff --git a/src/event.c b/src/event.c index 08adb05a..e7cebb55 100644 --- a/src/event.c +++ b/src/event.c @@ -16,9 +16,6 @@ #include #include "event.h" -#include "event_log.h" -#include "event_exec.h" -#include "event_url.h" #include "fastevent.h" #include "logging.h" #include "admin.h" diff --git a/src/event.h b/src/event.h index 3ef2b497..629dd0fb 100644 --- a/src/event.h +++ b/src/event.h @@ -100,4 +100,9 @@ void event_registration_push(event_registration_t **er, event_registration_t *ta void event_emit_clientevent(const char *trigger, client_t *client, const char *uri); #define event_emit_global(x) event_emit_clientevent((x), NULL, NULL) +/* Implementations */ +int event_get_exec(event_registration_t *er, config_options_t *options); +int event_get_url(event_registration_t *er, config_options_t *options); +int event_get_log(event_registration_t *er, config_options_t *options); + #endif diff --git a/src/event_exec.h b/src/event_exec.h deleted file mode 100644 index 8fe4f719..00000000 --- a/src/event_exec.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Icecast - * - * This program is distributed under the GNU General Public License, version 2. - * A copy of this license is included with this source. - * - * Copyright 2014, Philipp "ph3-der-loewe" Schafft , - */ - -#ifndef __EVENT_EXEC_H__ -#define __EVENT_EXEC_H__ - -int event_get_exec(event_registration_t *er, config_options_t *options); - -#endif diff --git a/src/event_log.h b/src/event_log.h deleted file mode 100644 index c655afdb..00000000 --- a/src/event_log.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Icecast - * - * This program is distributed under the GNU General Public License, version 2. - * A copy of this license is included with this source. - * - * Copyright 2014, Philipp "ph3-der-loewe" Schafft , - */ - -#ifndef __EVENT_LOG_H__ -#define __EVENT_LOG_H__ - -int event_get_log(event_registration_t *er, config_options_t *options); - -#endif diff --git a/src/event_url.h b/src/event_url.h deleted file mode 100644 index 16ff129c..00000000 --- a/src/event_url.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Icecast - * - * This program is distributed under the GNU General Public License, version 2. - * A copy of this license is included with this source. - * - * Copyright 2014, Philipp "ph3-der-loewe" Schafft , - */ - -#ifndef __EVENT_URL_H__ -#define __EVENT_URL_H__ - -int event_get_url(event_registration_t *er, config_options_t *options); - -#endif