From f37e3750cfe2f7077b47b21eccafecde49fb3434 Mon Sep 17 00:00:00 2001 From: Roel van Meer Date: Tue, 6 Sep 2022 16:41:50 +0200 Subject: [PATCH] Don't declare functions twice --- src/naemon/commands.c | 2 -- src/naemon/commands.h | 4 ++++ src/naemon/xrddefault.c | 5 +---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/naemon/commands.c b/src/naemon/commands.c index 7d1846783..af69fe44a 100644 --- a/src/naemon/commands.c +++ b/src/naemon/commands.c @@ -77,8 +77,6 @@ static void acknowledge_host_problem(host *, char *, char *, int, int, int, time static void acknowledge_service_problem(service *, char *, char *, int, int, int, time_t); /* acknowledges a service problem */ static void remove_host_acknowledgement(host *); /* removes a host acknowledgement */ static void remove_service_acknowledgement(service *); /* removes a service acknowledgement */ -void handle_host_acknowledgement_expire_event(struct nm_event_execution_properties *evprop); /* removes an expired host acknowledgement */ -void handle_service_acknowledgement_expire_event(struct nm_event_execution_properties *evprop); /* removes an expired service acknowledgement */ static void start_executing_service_checks(void); /* starts executing service checks */ static void stop_executing_service_checks(void); /* stops executing service checks */ static void start_accepting_passive_service_checks(void); /* starts accepting passive service check results */ diff --git a/src/naemon/commands.h b/src/naemon/commands.h index b7539d99a..21db023c3 100644 --- a/src/naemon/commands.h +++ b/src/naemon/commands.h @@ -10,6 +10,7 @@ #include "objects_contact.h" #include "objects_host.h" #include "objects_service.h" +#include "events.h" NAGIOS_BEGIN_DECL @@ -220,6 +221,9 @@ int shutdown_command_file_worker(void); int disconnect_command_file_worker(void); int command_worker_get_pid(void); +void handle_host_acknowledgement_expire_event(struct nm_event_execution_properties *evprop); /* removes an expired host acknowledgement */ +void handle_service_acknowledgement_expire_event(struct nm_event_execution_properties *evprop); /* removes an expired service acknowledgement */ + NAGIOS_END_DECL #endif diff --git a/src/naemon/xrddefault.c b/src/naemon/xrddefault.c index 95fb8985a..38446f36b 100644 --- a/src/naemon/xrddefault.c +++ b/src/naemon/xrddefault.c @@ -15,12 +15,9 @@ #include "nm_alloc.h" #include "broker.h" #include "events.h" +#include "commands.h" #include -/* from commands.c */ -void handle_host_acknowledgement_expire_event(struct nm_event_execution_properties *evprop); /* removes an expired host acknowledgement */ -void handle_service_acknowledgement_expire_event(struct nm_event_execution_properties *evprop); /* removes an expired service acknowledgement */ - /******************************************************************/ /********************* INIT/CLEANUP FUNCTIONS *********************/ /******************************************************************/