[icinga-checkins] icinga.org: icinga-core/master: remove grab_contactgroup_macros() and its prototype (Andreas Ericsson)

git at icinga.org git at icinga.org
Wed May 19 13:41:53 CEST 2010


Module: icinga-core
Branch: master
Commit: 6778f7c64b4fc49bbf2d124547c5d13fabda8381
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=6778f7c64b4fc49bbf2d124547c5d13fabda8381

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

remove grab_contactgroup_macros() and its prototype (Andreas Ericsson)

[--snip--]
It's no longer used, so we might as well get rid of it.
[--snip--]

fixes #411

---

 Changelog        |    1 +
 common/macros.c  |   18 ------------------
 include/macros.h |    1 -
 3 files changed, 1 insertions(+), 19 deletions(-)

diff --git a/Changelog b/Changelog
index 2d23908..88849ec 100644
--- a/Changelog
+++ b/Changelog
@@ -40,6 +40,7 @@ FIXES
 * 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)
+* core: remove grab_contactgroup_macros() and its prototype (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/common/macros.c b/common/macros.c
index 7c2b392..e7e88b5 100644
--- a/common/macros.c
+++ b/common/macros.c
@@ -356,24 +356,6 @@ int grab_contact_macros(contact *cntct){
 
 
 
-/* grab contactgroup macros */
-int grab_contactgroup_macros(contactgroup *cg){
-
-	/* clear contactgroup macros */
-	clear_contactgroup_macros();
-
-	/* save pointer to contactgroup for later */
-	macro_contactgroup_ptr=cg;
-
-	if(cg==NULL)
-		return ERROR;
-
-	return OK;
-	}
-
-
-
-
 /******************************************************************/
 /******************* MACRO GENERATION FUNCTIONS *******************/
 /******************************************************************/
diff --git a/include/macros.h b/include/macros.h
index 48c94fb..66054d1 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -216,7 +216,6 @@ int grab_host_macros(host *);                        	/* updates the host macro
 int grab_servicegroup_macros(servicegroup *);           /* updates servicegroup macros */
 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 */
 
 char *get_url_encoded_string(char *);			/* URL encode a string */
 





More information about the icinga-checkins mailing list