[icinga-checkins] icinga.org: icinga-core/mfriedrich/cgis: final fix compatibility problems on solaris 10 (Carl R. Friend) #2292

git at icinga.org git at icinga.org
Tue Apr 3 10:51:10 CEST 2012


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Apr  3 10:48:05 2012 +0200

final fix compatibility problems on solaris 10 (Carl R. Friend) #2292

refs #2292

---

 Changelog     |    1 +
 THANKS        |    1 +
 cgi/extinfo.c |    2 +-
 3 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Changelog b/Changelog
index e364fec..d3728f9 100644
--- a/Changelog
+++ b/Changelog
@@ -17,6 +17,7 @@ ENHANCEMENTS
 * core: avoid senseless looping when free()'ing macros (Andreas Ericsson) #2184
 * core: avoid insane looping through event list when rescheduling checks (Mathias Kettner, Andreas Ericsson) #2182
 * core: allow empty host groups in service and host dependencies if allow_empty_hostgroup_assignment flag is set (Daniel Wittenberg) #2255
+* core: fix compatibility problems on solaris 10 (affects core, cgis, ido) (Carl R. Friend) #2292
 
 * classic ui: Added option for max log entries displayed in showlog.cgi #2145
 * classic ui: Added config option for status totals in status.cgi #2018
diff --git a/THANKS b/THANKS
index fdd8294..94f9639 100644
--- a/THANKS
+++ b/THANKS
@@ -105,6 +105,7 @@ in various ways.  If we missed your name, let us know.
 * Marcus Fleige
 * Matthias Flittner
 * Bastian Friedrich
+* Carl R. Friend
 * Szabo Gabor
 * Mathieu Gagne
 * Dan Gailey
diff --git a/cgi/extinfo.c b/cgi/extinfo.c
index 1a29106..fb7b21e 100644
--- a/cgi/extinfo.c
+++ b/cgi/extinfo.c
@@ -177,6 +177,7 @@ int main(void) {
 	servicegroup *temp_servicegroup = NULL;
 	servicedependency *temp_sd = NULL;
 	hostdependency *temp_hd = NULL;
+	host * child_host;
 
 	mac = get_global_macros();
 
@@ -410,7 +411,6 @@ int main(void) {
 				/* Child Hosts */
 				if (extinfo_show_child_hosts == SHOW_CHILD_HOSTS_IMMEDIATE || extinfo_show_child_hosts == SHOW_CHILD_HOSTS_ALL) {
 					found = FALSE;
-					host * child_host;
 
 					printf("<DIV CLASS='data'>Immediate Child Hosts ");
 					printf("<img id='expand_image_immediate' src='%s%s' border=0 onClick=\"if (document.getElementById('immediate_child_hosts').style.display == 'none') { document.getElementById('immediate_child_hosts').style.display = ''; document.getElementById('immediate_child_hosts_gap').style.display = 'none'; document.getElementById('expand_image_immediate').src = '%s%s'; } else { document.getElementById('immediate_child_hosts').style.display = 'none'; document.getElementById('immediate_child_hosts_gap').style.display = ''; document.getElementById('expand_image_immediate').src = '%s%s'; }\">", url_images_path, EXPAND_ICON, url_images_path, COLLAPSE_ICON, url_images_path, EXPAND_ICON);





More information about the icinga-checkins mailing list