[icinga-checkins] icinga.org: icinga-core/test/core: clean unused code

git at icinga.org git at icinga.org
Wed Aug 24 15:51:27 CEST 2011


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Aug 24 15:50:52 2011 +0200

clean unused code

---

 base/notifications.c |    3 ---
 cgi/config.c         |    2 +-
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/base/notifications.c b/base/notifications.c
index fcafbeb..3f526f0 100644
--- a/base/notifications.c
+++ b/base/notifications.c
@@ -1233,9 +1233,6 @@ int host_notification(host *hst, int type, char *not_author, char *not_data, int
 	/* allocate memory for local mac */
 	memset(&mac, 0, sizeof(mac));
 
-	/* clear volatile macros */
-	clear_volatile_macros_r(&mac);
-
 	log_debug_info(DEBUGL_NOTIFICATIONS, 0, "Notification viability test passed.\n");
 
 	/* should the notification number be increased? */
diff --git a/cgi/config.c b/cgi/config.c
index 338957e..6e51d24 100644
--- a/cgi/config.c
+++ b/cgi/config.c
@@ -101,8 +101,8 @@ int CGI_ID = CONFIG_CGI_ID;
 
 int main(void) {
 	int result = OK;
-	mac = get_global_macros();
 	char *seldesc = "";
+	mac = get_global_macros();
 
 	/* get the arguments passed in the URL */
 	process_cgivars();





More information about the icinga-checkins mailing list