[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: header files: Remove dead prototypes (Andreas Ericsson)

git at icinga.org git at icinga.org
Wed May 12 22:45:48 CEST 2010


Module: icinga-core
Branch: mfriedrich/core
Commit: 9c774e59ad4ef31fcced9ce106ccbe47944f5f23
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=9c774e59ad4ef31fcced9ce106ccbe47944f5f23

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed May 12 22:30:15 2010 +0200

header files: Remove dead prototypes (Andreas Ericsson)

[--snip--]
The prototypes were for functions that no longer exist, and
some were never committed to version control. We're better
off without them.
[--snip--]

fixes #410

---

 Changelog          |    1 +
 include/broker.h   |    3 +--
 include/cgiutils.h |    2 --
 include/icinga.h   |    7 -------
 include/macros.h   |    2 --
 include/objects.h  |    7 -------
 6 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/Changelog b/Changelog
index 6424acd..2d23908 100644
--- a/Changelog
+++ b/Changelog
@@ -39,6 +39,7 @@ FIXES
 * core: xodtemplate: Use macro magic to get rid of 900 LoC (Andreas Ericsson)
 * core: more s/malloc(size) + init/calloc(1, size)/ replacements (Andreas Ericsson)
 * core: common/objects.c: Remove unused functions (Andreas Ericsson)
+* core: header files: Remove dead prototypes (Andreas Ericsson)
 
 * idoutils: Host DB inserts use string 'NULL\n' instead of NULL (William Preston)
 * idoutils: ndo2db_get_object_id fails to return existing IDs (William Preston)
diff --git a/include/broker.h b/include/broker.h
index 15950d9..cc618e1 100644
--- a/include/broker.h
+++ b/include/broker.h
@@ -48,7 +48,7 @@
 #define BROKER_COMMENT_DATA         	256	/* DONE */
 #define BROKER_DOWNTIME_DATA		512     /* DONE */
 #define BROKER_SYSTEM_COMMANDS          1024	/* DONE */
-#define BROKER_OCP_DATA                 2048	/* DONE */
+#define BROKER_OCP_DATA_UNUSED          2048	/* reusable */
 #define BROKER_STATUS_DATA              4096    /* DONE */
 #define BROKER_ADAPTIVE_DATA            8192    /* DONE */
 #define BROKER_EXTERNALCOMMAND_DATA     16384   /* DONE */
@@ -189,7 +189,6 @@ void broker_program_state(int,int,int,struct timeval *);
 void broker_timed_event(int,int,int,timed_event *,struct timeval *);
 void broker_log_data(int,int,int,char *,unsigned long,time_t,struct timeval *);
 void broker_event_handler(int,int,int,int,void *,int,int,struct timeval,struct timeval,double,int,int,int,char *,char *,char *,struct timeval *);
-void broker_ocp_data(int,int,int,void *,int,int,double,int,int,struct timeval *);
 void broker_system_command(int,int,int,struct timeval,struct timeval,double,int,int,int,char *,char *,struct timeval *);
 int broker_host_check(int,int,int,host *,int,int,int,struct timeval,struct timeval,char *,double,double,int,int,int,char *,char *,char *,char *,struct timeval *);
 int broker_service_check(int,int,int,service *,int,struct timeval,struct timeval,char *,double,double,int,int,int,char *,struct timeval *);
diff --git a/include/cgiutils.h b/include/cgiutils.h
index b98f306..2334053 100644
--- a/include/cgiutils.h
+++ b/include/cgiutils.h
@@ -430,7 +430,6 @@ typedef struct lifo_struct{
 /******************************** FUNCTIONS *******************************/
 
 void reset_cgi_vars(void);
-void free_cgi_vars(void);
 void free_memory(void);
 
 char * get_cgi_config_location(void);				/* gets location of the CGI config file to read */
@@ -448,7 +447,6 @@ int process_macros(char *,char **,int);				/* processes macros in a string */
 
 void get_time_string(time_t *,char *,int,int);			/* gets a date/time string */
 void get_interval_time_string(double,char *,int);		/* gets a time string for an interval of time */
-void get_expire_time_string(time_t *,char *,int);		/* gets a date/time string in the format used for Expire: tags*/
 
 char * url_encode(char *);		        		/* encodes a string in proper URL format */
 char * html_encode(char *,int);					/* encodes a string in HTML format (for what the user sees) */
diff --git a/include/icinga.h b/include/icinga.h
index da0fea2..d8164ed 100644
--- a/include/icinga.h
+++ b/include/icinga.h
@@ -562,7 +562,6 @@ void sighandler(int);                                	/* handles signals */
 void service_check_sighandler(int);                     /* handles timeouts when executing service checks */
 void host_check_sighandler(int);                        /* handles timeouts when executing host checks */
 void my_system_sighandler(int);				/* handles timeouts when executing commands via my_system() */
-void file_lock_sighandler(int);				/* handles timeouts while waiting for file locks */
 char *get_next_string_from_buf(char *buf, int *start_index, int bufsize);
 int compare_strings(char *,char *);                     /* compares two strings for equality */
 char *escape_newlines(char *);
@@ -605,7 +604,6 @@ int cmd_add_comment(int,time_t,char *);				/* add a service or host comment */
 int cmd_delete_comment(int,char *);				/* delete a service or host comment */
 int cmd_delete_all_comments(int,char *);			/* delete all comments associated with a host or service */
 int cmd_delay_notification(int,char *);				/* delay a service or host notification */
-int cmd_schedule_service_check(int,char *,int);			/* schedule an immediate or delayed service check */
 int cmd_schedule_check(int,char *);				/* schedule an immediate or delayed host check */
 int cmd_schedule_host_service_checks(int,char *,int);		/* schedule an immediate or delayed checks of all services on a host */
 int cmd_signal_process(int,char *);				/* schedules a program shutdown or restart */
@@ -686,11 +684,6 @@ void disable_contact_host_notifications(contact *);     /* disables host notific
 void enable_contact_service_notifications(contact *);   /* enables service notifications for a specific contact */
 void disable_contact_service_notifications(contact *);  /* disables service notifications for a specific contact */
 
-int init_check_result_worker_thread(void);
-int shutdown_check_result_worker_thread(void);
-void * check_result_worker_thread(void *);
-void cleanup_check_result_worker_thread(void *);
-
 int init_command_file_worker_thread(void);
 int shutdown_command_file_worker_thread(void);
 void * command_file_worker_thread(void *);
diff --git a/include/macros.h b/include/macros.h
index 1114ab2..48c94fb 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -217,8 +217,6 @@ int grab_servicegroup_macros(servicegroup *);           /* updates servicegroup
 int grab_hostgroup_macros(hostgroup *);                 /* updates hostgroup macros */
 int grab_contact_macros(contact *);                  	/* updates the contact macro data */
 int grab_contactgroup_macros(contactgroup *);           /* updates contactgroup macros */
-int grab_datetime_macros(void);				/* updates date/time macros */
-int grab_on_demand_macro(char *);                       /* fetches an on-demand macro */
 
 char *get_url_encoded_string(char *);			/* URL encode a string */
 
diff --git a/include/objects.h b/include/objects.h
index 112553c..8425cfa 100644
--- a/include/objects.h
+++ b/include/objects.h
@@ -741,10 +741,6 @@ int get_service_count(void);
 
 
 
-/**** Object Hash Functions ****/
-int add_servicedependency_to_hashlist(servicedependency *);
-
-
 /**** Object Search Functions ****/
 timeperiod * find_timeperiod(char *);						                /* finds a timeperiod object */
 host * find_host(char *);									/* finds a host object */
@@ -779,9 +775,6 @@ int is_host_immediate_parent_of_host(host *,host *);	                /* checks i
 int is_host_member_of_hostgroup(hostgroup *,host *);		        /* tests whether or not a host is a member of a specific hostgroup */
 int is_host_member_of_servicegroup(servicegroup *,host *);	        /* tests whether or not a service is a member of a specific servicegroup */
 int is_service_member_of_servicegroup(servicegroup *,service *);	/* tests whether or not a service is a member of a specific servicegroup */
-int is_contact_member_of_contactgroup(contactgroup *, contact *);	/* tests whether or not a contact is a member of a specific contact group */
-int is_contact_for_hostgroup(hostgroup *,contact *);	                /* tests whether or not a contact is a member of a specific hostgroup */
-int is_contact_for_servicegroup(servicegroup *,contact *);	        /* tests whether or not a contact is a member of a specific servicegroup */
 int is_contact_for_host(host *,contact *);			        /* tests whether or not a contact is a contact member for a specific host */
 int is_escalated_contact_for_host(host *,contact *);                    /* checks whether or not a contact is an escalated contact for a specific host */
 int is_contact_for_service(service *,contact *);		        /* tests whether or not a contact is a contact member for a specific service */





More information about the icinga-checkins mailing list