From: <ag...@us...> - 2013-04-07 15:42:25
|
Revision: 2729 http://nagios.svn.sourceforge.net/nagios/?rev=2729&view=rev Author: ageric Date: 2013-04-07 15:42:12 +0000 (Sun, 07 Apr 2013) Log Message: ----------- Janitor patch: Remove trailing whitespace from lines Editors should remove them when saving, and most do, but that tends to clutter up the diff output, so let's purge the evilness in a single commit instead. We only touch .c and .h files though, since whitespace has semantic meaning for Makefiles and is useful to be able to add to test-files and suchlike. Signed-off-by: Andreas Ericsson <ae...@op...> Modified Paths: -------------- nagioscore/trunk/base/events.c nagioscore/trunk/base/nerd.c nagioscore/trunk/base/notifications.c nagioscore/trunk/cgi/cgiauth.c nagioscore/trunk/cgi/cgiutils.c nagioscore/trunk/cgi/getcgi.c nagioscore/trunk/cgi/history.c nagioscore/trunk/cgi/status.c nagioscore/trunk/common/downtime.c nagioscore/trunk/include/cgiauth.h nagioscore/trunk/include/cgiutils.h nagioscore/trunk/include/getcgi.h nagioscore/trunk/lib/bitmap.c nagioscore/trunk/lib/test-iobroker.c nagioscore/trunk/worker/ping/worker-ping.c nagioscore/trunk/xdata/xdddefault.c nagioscore/trunk/xdata/xodtemplate.c Modified: nagioscore/trunk/base/events.c =================================================================== --- nagioscore/trunk/base/events.c 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/base/events.c 2013-04-07 15:42:12 UTC (rev 2729) @@ -736,24 +736,24 @@ log_debug_info(DEBUGL_FUNCTIONS, 0, "schedule_new_event()\n"); - get_datetime_string(&run_time, run_time_string, MAX_DATETIME_LENGTH, + get_datetime_string(&run_time, run_time_string, MAX_DATETIME_LENGTH, SHORT_DATE_TIME); log_debug_info(DEBUGL_EVENTS, 0, "New Event Details:\n"); - log_debug_info(DEBUGL_EVENTS, 0, " Type: %s\n", + log_debug_info(DEBUGL_EVENTS, 0, " Type: %s\n", EVENT_TYPE_STR( event_type)); - log_debug_info(DEBUGL_EVENTS, 0, " High Priority: %s\n", + log_debug_info(DEBUGL_EVENTS, 0, " High Priority: %s\n", ( high_priority ? "Yes" : "No")); - log_debug_info(DEBUGL_EVENTS, 0, " Run Time: %s\n", + log_debug_info(DEBUGL_EVENTS, 0, " Run Time: %s\n", run_time_string); - log_debug_info(DEBUGL_EVENTS, 0, " Recurring: %s\n", + log_debug_info(DEBUGL_EVENTS, 0, " Recurring: %s\n", ( recurring ? "Yes" : "No")); - log_debug_info(DEBUGL_EVENTS, 0, " Event Interval: %lu\n", + log_debug_info(DEBUGL_EVENTS, 0, " Event Interval: %lu\n", event_interval); - log_debug_info(DEBUGL_EVENTS, 0, " Compensate for Time Change: %s\n", + log_debug_info(DEBUGL_EVENTS, 0, " Compensate for Time Change: %s\n", ( compensate_for_time_change ? "Yes" : "No")); - log_debug_info(DEBUGL_EVENTS, 0, " Event Options: %d\n", + log_debug_info(DEBUGL_EVENTS, 0, " Event Options: %d\n", event_options); - + new_event = (timed_event *)calloc(1, sizeof(timed_event)); if(new_event != NULL) { new_event->event_type = event_type; Modified: nagioscore/trunk/base/nerd.c =================================================================== --- nagioscore/trunk/base/nerd.c 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/base/nerd.c 2013-04-07 15:42:12 UTC (rev 2729) @@ -103,7 +103,7 @@ } return 0; } - + static int subscribe(int sd, struct nerd_channel *chan, char *fmt) { struct nerd_subscription *subscr; Modified: nagioscore/trunk/base/notifications.c =================================================================== --- nagioscore/trunk/base/notifications.c 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/base/notifications.c 2013-04-07 15:42:12 UTC (rev 2729) @@ -136,7 +136,7 @@ /* create the contact notification list for this service */ - /* 2011-11-01 MF: + /* 2011-11-01 MF: check viability before adding a contact to the notification list, requires type this prevents us from running through all @@ -1082,7 +1082,7 @@ /* reset memory for local macro data */ memset(&mac, 0, sizeof(mac)); - /* 2011-11-01 MF: + /* 2011-11-01 MF: check viability before adding a contact to the notification list, requires type this prevents us from running through all Modified: nagioscore/trunk/cgi/cgiauth.c =================================================================== --- nagioscore/trunk/cgi/cgiauth.c 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/cgi/cgiauth.c 2013-04-07 15:42:12 UTC (rev 2729) @@ -331,7 +331,7 @@ if(is_authorized_for_service(temp_service, authinfo) == TRUE) return TRUE; } - + /*return TRUE*/; return FALSE; } Modified: nagioscore/trunk/cgi/cgiutils.c =================================================================== --- nagioscore/trunk/cgi/cgiutils.c 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/cgi/cgiutils.c 2013-04-07 15:42:12 UTC (rev 2729) @@ -288,8 +288,8 @@ else if(!strcmp(var, "refresh_rate")) refresh_rate = atoi(val); - - /* page limit added 2/1/2012 -MG */ + + /* page limit added 2/1/2012 -MG */ else if(!strcmp(var, "result_limit")) result_limit = atoi(val); @@ -333,11 +333,11 @@ snprintf(url_media_path, sizeof(url_media_path), "%smedia/", url_html_path); url_media_path[sizeof(url_media_path) - 1] = '\x0'; - - /* added JS directory 2/1/2012 -MG */ + + /* added JS directory 2/1/2012 -MG */ snprintf(url_js_path, sizeof(url_js_path), "%sjs/", url_html_path); url_js_path[sizeof(url_js_path) - 1] = '\x0'; - + } else if(!strcmp(var, "service_critical_sound")) @@ -962,10 +962,10 @@ /* Most ASCII characters don't get encoded */ if(( *inwcp >= 0x20 && *inwcp <= 0x7e) && - ( !( '"' == *inwcp || '&' == *inwcp || '\'' == *inwcp || + ( !( '"' == *inwcp || '&' == *inwcp || '\'' == *inwcp || '<' == *inwcp || '>' == *inwcp))) { wctomb_result = wctomb( mbtemp, *inwcp); - if(( wctomb_result > 0) && + if(( wctomb_result > 0) && ((( outstp - encoded_html_string) + wctomb_result) < output_max)) { strncpy( outstp, mbtemp, wctomb_result); outstp += wctomb_result; @@ -990,7 +990,7 @@ if(escape_html_tags == FALSE) { wctomb_result = wctomb( mbtemp, *inwcp); - if(( wctomb_result > 0) && + if(( wctomb_result > 0) && ((( outstp - encoded_html_string) + wctomb_result) < output_max)) { strncpy( outstp, mbtemp, wctomb_result); outstp += wctomb_result; @@ -1008,7 +1008,7 @@ if(escape_html_tags == FALSE) { wctomb_result = wctomb( mbtemp, *inwcp); - if(( wctomb_result > 0) && + if(( wctomb_result > 0) && ((( outstp - encoded_html_string) + wctomb_result) < output_max)) { strncpy( outstp, mbtemp, wctomb_result); outstp += wctomb_result; @@ -1025,7 +1025,7 @@ /* for simplicity, all other chars represented by their numeric value */ else { sprintf( temp_expansion, "&#%u", *( unsigned int *)inwcp); - if((( outstp - encoded_html_string) + strlen( temp_expansion)) < + if((( outstp - encoded_html_string) + strlen( temp_expansion)) < output_max) { strncpy( outstp, temp_expansion, strlen( temp_expansion)); outstp += strlen( temp_expansion); @@ -1105,15 +1105,15 @@ input++; } - /* Alpha-numeric characters and a few other characters don't get + /* Alpha-numeric characters and a few other characters don't get encoded */ - else if(( *wctemp >= '0' && *wctemp <= '9') || - ( *wctemp >= 'A' && *wctemp <= 'Z') || - ( *wctemp >= 'a' && *wctemp <= 'z') || - ' ' == *wctemp || '-' == *wctemp || '.' == *wctemp || + else if(( *wctemp >= '0' && *wctemp <= '9') || + ( *wctemp >= 'A' && *wctemp <= 'Z') || + ( *wctemp >= 'a' && *wctemp <= 'z') || + ' ' == *wctemp || '-' == *wctemp || '.' == *wctemp || '_' == *wctemp || ':' == *wctemp) { wctomb_result = wctomb( mbtemp, wctemp[0]); - if(( wctomb_result > 0) && + if(( wctomb_result > 0) && ((( stp - encoded_html_string) + wctomb_result) < output_max)) { strncpy( stp, mbtemp, wctomb_result); stp += wctomb_result; @@ -1124,7 +1124,7 @@ /* Encode everything else (this may be excessive) */ else { sprintf( temp_expansion, "&#%u", ( unsigned int)wctemp[ 0]); - if((( stp - encoded_html_string) + strlen( temp_expansion)) < + if((( stp - encoded_html_string) + strlen( temp_expansion)) < output_max) { strncpy( stp, temp_expansion, strlen( temp_expansion)); stp += strlen( temp_expansion); Modified: nagioscore/trunk/cgi/getcgi.c =================================================================== --- nagioscore/trunk/cgi/getcgi.c 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/cgi/getcgi.c 2013-04-07 15:42:12 UTC (rev 2729) @@ -141,7 +141,7 @@ /* check for NULL query string environment variable - 04/28/00 (Ludo Bosmans) */ if(getenv("QUERY_STRING") == NULL) { cgiinput = (char *)malloc(1); - if(cgiinput != NULL) + if(cgiinput != NULL) cgiinput[0] = '\x0'; } else @@ -311,7 +311,7 @@ if( NULL != accept_langs) { /* Sort the results */ - qsort( accept_langs->languages, accept_langs->count, + qsort( accept_langs->languages, accept_langs->count, sizeof( accept_langs->languages[ 0]), compare_accept_languages); /* Try each language in order of priority */ @@ -329,7 +329,7 @@ } if( NULL == locale) { /* Still isn't set */ /* Try the fail safe locales */ - for( x = 0; (( x < ( sizeof( locale_failsafe) / sizeof( char *))) && + for( x = 0; (( x < ( sizeof( locale_failsafe) / sizeof( char *))) && ( NULL == locale)); x++) { locale = setlocale( LC_ALL, locale_failsafe[ x]); } @@ -375,7 +375,7 @@ langs->count++; if( NULL == langs->languages) { /* Adding first language */ - if( NULL == ( langs->languages = + if( NULL == ( langs->languages = malloc( langs->count * sizeof( accept_language *)))) { printf( "Unable to allocate memory for first language\n"); langs->count--; @@ -386,7 +386,7 @@ } else { /* Adding additional language */ - if( NULL == ( langs->languages = realloc( langs->languages, + if( NULL == ( langs->languages = realloc( langs->languages, langs->count * sizeof( accept_language *)))) { printf( "Unable to allocate memory for additional language\n"); langs->count--; @@ -395,7 +395,7 @@ return NULL; } } - if( NULL == ( langs->languages[ langs->count - 1] = + if( NULL == ( langs->languages[ langs->count - 1] = malloc( sizeof( accept_language)))) { printf( "Unable to allocate memory for language\n"); langs->count--; @@ -406,12 +406,12 @@ langs->languages[ langs->count - 1]->language = ( char *)NULL; langs->languages[ langs->count - 1]->locality = ( char *)NULL; langs->languages[ langs->count - 1]->q = 1.0; - + /* Check to see if there is a q value */ qdelim = strstr( langtok, ACCEPT_LANGUAGE_Q_DELIMITER); if( NULL != qdelim) { /* found a q value */ - langs->languages[ langs->count - 1]->q = + langs->languages[ langs->count - 1]->q = strtod( qdelim + strlen( ACCEPT_LANGUAGE_Q_DELIMITER), NULL); langtok[ qdelim - langtok] = '\0'; } @@ -423,9 +423,9 @@ if( NULL != localitydelim) { /* We have a locality delimiter, so copy it */ - if( NULL == ( langs->languages[ langs->count - 1]->locality = + if( NULL == ( langs->languages[ langs->count - 1]->locality = strdup( localitydelim + 1))) { - printf( "Unable to allocate memory for locality '%s'\n", + printf( "Unable to allocate memory for locality '%s'\n", langtok); free_accept_languages( langs); free( langdup); @@ -442,16 +442,16 @@ /* Then null out the delimiter so the language copy works */ *localitydelim = '\0'; } - if( NULL == ( langs->languages[ langs->count - 1]->language = + if( NULL == ( langs->languages[ langs->count - 1]->language = strdup( langtok))) { - printf( "Unable to allocate memory for language '%s'\n", + printf( "Unable to allocate memory for language '%s'\n", langtok); free_accept_languages( langs); free( langdup); return NULL; } - /* Get the next language token */ + /* Get the next language token */ langtok = strtok_r( NULL, ",", &saveptr); } @@ -464,7 +464,7 @@ accept_language * lang2 = *( accept_language **)p2; if( lang1->q == lang2->q) { - if((( NULL == lang1->locality) && ( NULL == lang2->locality)) || + if((( NULL == lang1->locality) && ( NULL == lang2->locality)) || (( NULL != lang1->locality) && ( NULL != lang2->locality))) { return 0; } Modified: nagioscore/trunk/cgi/history.c =================================================================== --- nagioscore/trunk/cgi/history.c 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/cgi/history.c 2013-04-07 15:42:12 UTC (rev 2729) @@ -801,21 +801,21 @@ else if(display_type == DISPLAY_HOSTS) { if(history_type == HOST_HISTORY || history_type == SERVICE_HISTORY) { - snprintf(match1, sizeof( match1), + snprintf(match1, sizeof( match1), " HOST ALERT: %s;", host_name); - snprintf(match2, sizeof( match2), + snprintf(match2, sizeof( match2), " SERVICE ALERT: %s;", host_name); } else if(history_type == HOST_FLAPPING_HISTORY || history_type == SERVICE_FLAPPING_HISTORY) { - snprintf(match1, sizeof( match1), + snprintf(match1, sizeof( match1), " HOST FLAPPING ALERT: %s;", host_name); - snprintf(match2, sizeof( match2), + snprintf(match2, sizeof( match2), " SERVICE FLAPPING ALERT: %s;", host_name); } else if(history_type == HOST_DOWNTIME_HISTORY || history_type == SERVICE_DOWNTIME_HISTORY) { - snprintf(match1, sizeof( match1), + snprintf(match1, sizeof( match1), " HOST DOWNTIME ALERT: %s;", host_name); - snprintf(match2, sizeof( match2), + snprintf(match2, sizeof( match2), " SERVICE DOWNTIME ALERT: %s;", host_name); } Modified: nagioscore/trunk/cgi/status.c =================================================================== --- nagioscore/trunk/cgi/status.c 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/cgi/status.c 2013-04-07 15:42:12 UTC (rev 2729) @@ -150,8 +150,8 @@ int group_style_type = STYLE_OVERVIEW; int navbar_search = FALSE; -/* experimental paging feature */ -int temp_result_limit; +/* experimental paging feature */ +int temp_result_limit; int page_start; int limit_results = TRUE; @@ -546,15 +546,15 @@ printf("<link rel='stylesheet' type='text/css' href='%s%s' />\n", url_stylesheets_path, COMMON_CSS); printf("<link rel='stylesheet' type='text/css' href='%s%s' />\n", url_stylesheets_path, STATUS_CSS); } - - /* added jquery library 1/31/2012 */ - printf("<script type='text/javascript' src='%s%s'></script>\n",url_js_path, JQUERY_JS); - /* JS function to append content to elements on page */ - printf("<script type='text/javascript'>\n"); - printf("$(document).ready(function() { $('#top_page_numbers').append($('#bottom_page_numbers').html() ); });"); + + /* added jquery library 1/31/2012 */ + printf("<script type='text/javascript' src='%s%s'></script>\n",url_js_path, JQUERY_JS); + /* JS function to append content to elements on page */ + printf("<script type='text/javascript'>\n"); + printf("$(document).ready(function() { $('#top_page_numbers').append($('#bottom_page_numbers').html() ); });"); printf("function set_limit(url) { \nthis.location = url+'&limit='+$('#limit').val();\n }"); printf("</script>\n"); - + printf("</head>\n"); printf("<body class='status'>\n"); @@ -779,7 +779,7 @@ service_filter = strdup(variables[x]); strip_html_brackets(service_filter); } - + /* experimental page limit feature */ else if(!strcmp(variables[x], "start")) { x++; @@ -788,23 +788,23 @@ break; } page_start = atoi(variables[x]); - } + } else if(!strcmp(variables[x], "limit")) { x++; if(variables[x] == NULL) { error = TRUE; break; } - temp_result_limit = atoi(variables[x]); - if(temp_result_limit == 0) + temp_result_limit = atoi(variables[x]); + if(temp_result_limit == 0) limit_results = FALSE; - else - limit_results = TRUE; - } - + else + limit_results = TRUE; + } + } - + /* free memory allocated to the CGI variables */ free_cgivars(variables); @@ -888,9 +888,9 @@ printf("<th class='serviceTotals'>"); printf("<a class='serviceTotals' href='%s?", STATUS_CGI); - /* paging */ + /* paging */ if(temp_result_limit) - printf("limit=%i&",temp_result_limit); + printf("limit=%i&",temp_result_limit); if(display_type == DISPLAY_HOSTS) printf("host=%s", (host_name == NULL) ? "all" : url_encode(host_name)); else if(display_type == DISPLAY_SERVICEGROUPS) @@ -903,9 +903,9 @@ printf("<th class='serviceTotals'>"); printf("<a class='serviceTotals' href='%s?", STATUS_CGI); - /* paging */ + /* paging */ if(temp_result_limit) - printf("limit=%i&",temp_result_limit); + printf("limit=%i&",temp_result_limit); if(display_type == DISPLAY_HOSTS) printf("host=%s", (host_name == NULL) ? "all" : url_encode(host_name)); else if(display_type == DISPLAY_SERVICEGROUPS) @@ -918,9 +918,9 @@ printf("<th class='serviceTotals'>"); printf("<a class='serviceTotals' href='%s?", STATUS_CGI); - /* paging */ + /* paging */ if(temp_result_limit) - printf("limit=%i&",temp_result_limit); + printf("limit=%i&",temp_result_limit); if(display_type == DISPLAY_HOSTS) printf("host=%s", (host_name == NULL) ? "all" : url_encode(host_name)); else if(display_type == DISPLAY_SERVICEGROUPS) @@ -933,9 +933,9 @@ printf("<th class='serviceTotals'>"); printf("<a class='serviceTotals' href='%s?", STATUS_CGI); - /* paging */ + /* paging */ if(temp_result_limit) - printf("limit=%i&",temp_result_limit); + printf("limit=%i&",temp_result_limit); if(display_type == DISPLAY_HOSTS) printf("host=%s", (host_name == NULL) ? "all" : url_encode(host_name)); else if(display_type == DISPLAY_SERVICEGROUPS) @@ -948,9 +948,9 @@ printf("<th class='serviceTotals'>"); printf("<a class='serviceTotals' href='%s?", STATUS_CGI); - /* paging */ + /* paging */ if(temp_result_limit) - printf("limit=%i&",temp_result_limit); + printf("limit=%i&",temp_result_limit); if(display_type == DISPLAY_HOSTS) printf("host=%s", (host_name == NULL) ? "all" : url_encode(host_name)); else if(display_type == DISPLAY_SERVICEGROUPS) @@ -992,9 +992,9 @@ printf("<th class='serviceTotals'>"); printf("<a class='serviceTotals' href='%s?", STATUS_CGI); - /* paging */ + /* paging */ if(temp_result_limit) - printf("limit=%i&",temp_result_limit); + printf("limit=%i&",temp_result_limit); if(display_type == DISPLAY_HOSTS) printf("host=%s", (host_name == NULL) ? "all" : url_encode(host_name)); else if(display_type == DISPLAY_SERVICEGROUPS) @@ -1007,9 +1007,9 @@ printf("<th class='serviceTotals'>"); printf("<a class='serviceTotals' href='%s?", STATUS_CGI); - /* paging */ + /* paging */ if(temp_result_limit) - printf("limit=%i&",temp_result_limit); + printf("limit=%i&",temp_result_limit); if(display_type == DISPLAY_HOSTS) printf("host=%s", (host_name == NULL) ? "all" : url_encode(host_name)); else if(display_type == DISPLAY_SERVICEGROUPS) @@ -1114,9 +1114,9 @@ printf("<th class='hostTotals'>"); printf("<a class='hostTotals' href='%s?", STATUS_CGI); - /* paging */ + /* paging */ if(temp_result_limit) - printf("limit=%i&",temp_result_limit); + printf("limit=%i&",temp_result_limit); if(display_type == DISPLAY_HOSTS) printf("host=%s", (host_name == NULL) ? "all" : url_encode(host_name)); else if(display_type == DISPLAY_SERVICEGROUPS) @@ -1135,9 +1135,9 @@ printf("<th class='hostTotals'>"); printf("<a class='hostTotals' href='%s?", STATUS_CGI); - /* paging */ + /* paging */ if(temp_result_limit) - printf("limit=%i&",temp_result_limit); + printf("limit=%i&",temp_result_limit); if(display_type == DISPLAY_HOSTS) printf("host=%s", (host_name == NULL) ? "all" : url_encode(host_name)); else if(display_type == DISPLAY_SERVICEGROUPS) @@ -1156,9 +1156,9 @@ printf("<th class='hostTotals'>"); printf("<a class='hostTotals' href='%s?", STATUS_CGI); - /* paging */ + /* paging */ if(temp_result_limit) - printf("limit=%i&",temp_result_limit); + printf("limit=%i&",temp_result_limit); if(display_type == DISPLAY_HOSTS) printf("host=%s", (host_name == NULL) ? "all" : url_encode(host_name)); else if(display_type == DISPLAY_SERVICEGROUPS) @@ -1177,9 +1177,9 @@ printf("<th class='hostTotals'>"); printf("<a class='hostTotals' href='%s?", STATUS_CGI); - /* paging */ + /* paging */ if(temp_result_limit) - printf("limit=%i&",temp_result_limit); + printf("limit=%i&",temp_result_limit); if(display_type == DISPLAY_HOSTS) printf("host=%s", (host_name == NULL) ? "all" : url_encode(host_name)); else if(display_type == DISPLAY_SERVICEGROUPS) @@ -1223,9 +1223,9 @@ printf("<th class='hostTotals'>"); printf("<a class='hostTotals' href='%s?", STATUS_CGI); - /* paging */ + /* paging */ if(temp_result_limit) - printf("limit=%i&",temp_result_limit); + printf("limit=%i&",temp_result_limit); if(display_type == DISPLAY_HOSTS) printf("host=%s", (host_name == NULL) ? "all" : url_encode(host_name)); else if(display_type == DISPLAY_SERVICEGROUPS) @@ -1244,9 +1244,9 @@ printf("<th class='hostTotals'>"); printf("<a class='hostTotals' href='%s?", STATUS_CGI); - /* paging */ + /* paging */ if(temp_result_limit) - printf("limit=%i&",temp_result_limit); + printf("limit=%i&",temp_result_limit); if(display_type == DISPLAY_HOSTS) printf("host=%s", (host_name == NULL) ? "all" : url_encode(host_name)); else if(display_type == DISPLAY_SERVICEGROUPS) @@ -1400,7 +1400,7 @@ - /* handle navigation GET variables */ + /* handle navigation GET variables */ snprintf(temp_url, sizeof(temp_url) - 1, "%s?", STATUS_CGI); temp_url[sizeof(temp_url) - 1] = '\x0'; if(display_type == DISPLAY_HOSTS) @@ -1436,7 +1436,7 @@ strncat(temp_url, temp_buffer, sizeof(temp_url) - strlen(temp_url) - 1); temp_url[sizeof(temp_url) - 1] = '\x0'; } - /* + /* if(temp_result_limit) { snprintf(temp_buffer, sizeof(temp_buffer) - 1, "&limit=%i", temp_result_limit); temp_buffer[sizeof(temp_buffer) - 1] = '\x0'; @@ -1444,15 +1444,15 @@ temp_url[sizeof(temp_url) - 1] = '\x0'; } */ - + /* GET input can override cgi.cfg */ if(limit_results==TRUE) result_limit = temp_result_limit ? temp_result_limit : result_limit; - else - result_limit = 0; + else + result_limit = 0; /* select box to set result limit */ - create_page_limiter(result_limit,temp_url); - + create_page_limiter(result_limit,temp_url); + /* the main list of services */ printf("<table border=0 width=100%% class='status'>\n"); printf("<tr>\n"); @@ -1483,7 +1483,7 @@ /* check all services... */ while(1) { - + /* get the next service to display */ if(use_sort == TRUE) { if(first_entry == TRUE) @@ -1571,14 +1571,14 @@ show_service = TRUE; } - /* final checks for display visibility, add to total results. Used for page numbers */ - if(result_limit == 0) - limit_results = FALSE; - + /* final checks for display visibility, add to total results. Used for page numbers */ + if(result_limit == 0) + limit_results = FALSE; + if( (limit_results == TRUE && show_service== TRUE) && ( (total_entries < page_start) || (total_entries >= (page_start + result_limit)) ) ) { total_entries++; - show_service = FALSE; - } + show_service = FALSE; + } /* a visible entry */ if(show_service == TRUE) { @@ -1592,15 +1592,15 @@ printf("<tr><td colspan='6'></td></tr>\n"); printf("<tr><td colspan='6'></td></tr>\n"); } - } + } if(odd) odd = 0; else odd = 1; - + /* keep track of total number of services we're displaying */ - visible_entries++; + visible_entries++; total_entries++; /* get the last service check time */ @@ -1892,7 +1892,7 @@ printf("</tr>\n"); /* mod to account for paging */ - if(visible_entries != 0) + if(visible_entries != 0) last_host = temp_status->host_name; } @@ -1914,10 +1914,10 @@ } } else { - /* do page numbers if applicable */ + /* do page numbers if applicable */ create_pagenumbers(total_entries,temp_url,TRUE); } - + return; } @@ -1968,8 +1968,8 @@ // printf("<P>\n"); - + printf("<table class='pageTitle' border='0' width='100%%'>\n"); printf("<tr>\n"); @@ -2049,23 +2049,23 @@ temp_buffer[sizeof(temp_buffer) - 1] = '\x0'; strncat(temp_url, temp_buffer, sizeof(temp_url) - strlen(temp_url) - 1); temp_url[sizeof(temp_url) - 1] = '\x0'; - } - /* + } + /* if(temp_result_limit) { snprintf(temp_buffer, sizeof(temp_buffer) - 1, "&limit=%i", temp_result_limit); temp_buffer[sizeof(temp_buffer) - 1] = '\x0'; strncat(temp_url, temp_buffer, sizeof(temp_url) - strlen(temp_url) - 1); temp_url[sizeof(temp_url) - 1] = '\x0'; - } + } */ /* GET input can override cgi.cfg */ if(limit_results==TRUE) result_limit = temp_result_limit ? temp_result_limit : result_limit; - else - result_limit = 0; + else + result_limit = 0; /* select box to set result limit */ - create_page_limiter(result_limit,temp_url); + create_page_limiter(result_limit,temp_url); /* the main list of hosts */ @@ -2144,18 +2144,18 @@ total_entries++; - - /* final checks for display visibility, add to total results. Used for page numbers */ - if(result_limit == 0) - limit_results = FALSE; - + + /* final checks for display visibility, add to total results. Used for page numbers */ + if(result_limit == 0) + limit_results = FALSE; + if( (limit_results == TRUE) && ( (total_entries < page_start) || (total_entries >= (page_start + result_limit)) ) ) { - continue; - } - - visible_entries++; - + continue; + } + visible_entries++; + + /* grab macros */ grab_host_macros_r(mac, temp_host); @@ -2351,7 +2351,7 @@ } else { - /* do page numbers if applicable */ + /* do page numbers if applicable */ create_pagenumbers(total_entries,temp_url,FALSE); } return; @@ -5381,59 +5381,59 @@ void create_pagenumbers(int total_entries,char *temp_url,int type_service) { - int pages = 1; - int tmp_start; + int pages = 1; + int tmp_start; int i; - int previous_page; + int previous_page; - /* do page numbers if applicable */ + /* do page numbers if applicable */ if(result_limit > 0 && total_entries > result_limit) { - pages = (total_entries / result_limit); + pages = (total_entries / result_limit); previous_page = (page_start-result_limit) > 0 ? (page_start-result_limit) : 0; printf("<div id='bottom_page_numbers'>\n"); - printf("<div class='inner_numbers'>\n"); - printf("<a href='%s&start=0&limit=%i' class='pagenumber' title='First Page'><img src='%s%s' height='15' width='15' alt='<<' /></a>\n",temp_url,result_limit,url_images_path,FIRST_PAGE_ICON); + printf("<div class='inner_numbers'>\n"); + printf("<a href='%s&start=0&limit=%i' class='pagenumber' title='First Page'><img src='%s%s' height='15' width='15' alt='<<' /></a>\n",temp_url,result_limit,url_images_path,FIRST_PAGE_ICON); printf("<a href='%s&start=%i&limit=%i' class='pagenumber' title='Previous Page'><img src='%s%s' height='15' width='10' alt='<' /></a>\n",temp_url,previous_page,result_limit,url_images_path,PREVIOUS_PAGE_ICON); for(i = 0; i < (pages + 1); i++) { tmp_start = (i * result_limit); - if(tmp_start == page_start) + if(tmp_start == page_start) printf("<div class='pagenumber current_page'> %i </div>\n",(i+1)); - else + else printf("<a class='pagenumber' href='%s&start=%i&limit=%i' title='Page %i'> %i </a>\n",temp_url,tmp_start,result_limit,(i+1),(i+1)); } - + printf("<a href='%s&start=%i&limit=%i' class='pagenumber' title='Next Page'><img src='%s%s' height='15' width='10' alt='>' /></a>\n",temp_url,(page_start+result_limit),result_limit,url_images_path,NEXT_PAGE_ICON); printf("<a href='%s&start=%i&limit=%i' class='pagenumber' title='Last Page'><img src='%s%s' height='15' width='15' alt='>>' /></a>\n",temp_url,((pages)*result_limit),result_limit,url_images_path,LAST_PAGE_ICON); printf("</div> <!-- end inner_page_numbers div -->\n"); if(type_service == TRUE) printf("<br /><div class='itemTotalsTitle'>Results %i - %i of %d Matching Services</div>\n</div>\n",page_start,((page_start+result_limit) > total_entries ? total_entries :(page_start+result_limit) ),total_entries ); - else - printf("<br /><div class='itemTotalsTitle'>Results %i - %i of %d Matching Hosts</div>\n\n",page_start,((page_start+result_limit) > total_entries ? total_entries :(page_start+result_limit) ),total_entries ); + else + printf("<br /><div class='itemTotalsTitle'>Results %i - %i of %d Matching Hosts</div>\n\n",page_start,((page_start+result_limit) > total_entries ? total_entries :(page_start+result_limit) ),total_entries ); printf("</div> <!-- end bottom_page_numbers div -->\n\n"); } else { if(type_service == TRUE) printf("<br /><div class='itemTotalsTitle'>Results %i - %i of %d Matching Services</div>\n</div>\n",1,total_entries,total_entries); - else - printf("<br /><div class='itemTotalsTitle'>Results %i - %i of %d Matching Hosts</div>\n\n",1,total_entries,total_entries); - + else + printf("<br /><div class='itemTotalsTitle'>Results %i - %i of %d Matching Hosts</div>\n\n",1,total_entries,total_entries); + } - - /* show total results displayed */ + + /* show total results displayed */ //printf("<br /><div class='itemTotalsTitle'>Results %i - %i of %d Matching Services</div>\n</div>\n",page_start,((page_start+result_limit) > total_entries ? total_entries :(page_start+result_limit) ),total_entries ); - + } void create_page_limiter(int result_limit,char *temp_url) { - /* Result Limit Select Box */ + /* Result Limit Select Box */ printf("<div id='pagelimit'>\n<div id='result_limit'>\n"); printf("<label for='limit'>Limit Results: </label>\n"); printf("<select onchange='set_limit(\"%s\")' name='limit' id='limit'>\n",temp_url); - printf("<option %s value='50'>50</option>\n",( (result_limit==50) ? "selected='selected'" : "") ); - printf("<option %s value='100'>100</option>\n",( (result_limit==100) ? "selected='selected'" : "") ); + printf("<option %s value='50'>50</option>\n",( (result_limit==50) ? "selected='selected'" : "") ); + printf("<option %s value='100'>100</option>\n",( (result_limit==100) ? "selected='selected'" : "") ); printf("<option %s value='250'>250</option>\n",( (result_limit==250) ? "selected='selected'" : "") ); printf("<option %s value='1000'>1000</option>\n",( (result_limit==1000) ? "selected='selected'" : "") ); printf("<option %s value='0'>All</option>\n",(result_limit==0) ? "selected='selected'" : ""); Modified: nagioscore/trunk/common/downtime.c =================================================================== --- nagioscore/trunk/common/downtime.c 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/common/downtime.c 2013-04-07 15:42:12 UTC (rev 2729) @@ -245,7 +245,7 @@ unsigned long *new_downtime_id = NULL; int was_in_effect = FALSE; - log_debug_info(DEBUGL_FUNCTIONS, 0, "register_downtime( %d, %lu)\n", type, + log_debug_info(DEBUGL_FUNCTIONS, 0, "register_downtime( %d, %lu)\n", type, downtime_id); /* find the downtime entry in memory */ @@ -258,17 +258,17 @@ /* find the host or service associated with this downtime */ if(temp_downtime->type == HOST_DOWNTIME) { if((hst = find_host(temp_downtime->host_name)) == NULL) { - log_debug_info(DEBUGL_DOWNTIME, 1, - "Cannot find host (%s) for downtime ID: %lu\n", + log_debug_info(DEBUGL_DOWNTIME, 1, + "Cannot find host (%s) for downtime ID: %lu\n", temp_downtime->host_name, downtime_id); return ERROR; } } else { if((svc = find_service(temp_downtime->host_name, temp_downtime->service_description)) == NULL) { - log_debug_info(DEBUGL_DOWNTIME, 1, - "Cannot find service (%s) for host (%s) for downtime ID: %lu\n", - temp_downtime->service_description, temp_downtime->host_name, + log_debug_info(DEBUGL_DOWNTIME, 1, + "Cannot find service (%s) for host (%s) for downtime ID: %lu\n", + temp_downtime->service_description, temp_downtime->host_name, downtime_id); return ERROR; } @@ -321,22 +321,22 @@ my_free(temp_buffer); /* only non-triggered downtime is scheduled... */ - if((temp_downtime->triggered_by == 0) && ((TRUE == temp_downtime->fixed) || - ((FALSE == temp_downtime->fixed) && + if((temp_downtime->triggered_by == 0) && ((TRUE == temp_downtime->fixed) || + ((FALSE == temp_downtime->fixed) && (TRUE == temp_downtime->is_in_effect)))) { /* If this is a fixed downtime, schedule the event to start it. If this - is a flexible downtime, normally we wait for one of the - check_pending_flex_*_downtime() functions to start it, but if the - downtime is already in effect, this means that we are restarting - Nagios and the downtime was in effect when we last shutdown - Nagios, so we should restart the flexible downtime now. This - should work even if the downtime has ended because the - handle_scheduled_dowtime() function will immediately schedule + is a flexible downtime, normally we wait for one of the + check_pending_flex_*_downtime() functions to start it, but if the + downtime is already in effect, this means that we are restarting + Nagios and the downtime was in effect when we last shutdown + Nagios, so we should restart the flexible downtime now. This + should work even if the downtime has ended because the + handle_scheduled_dowtime() function will immediately schedule another downtime event which will end the downtime. */ if((new_downtime_id = (unsigned long *)malloc(sizeof(unsigned long *)))) { *new_downtime_id = downtime_id; temp_downtime->start_event = schedule_new_event(EVENT_SCHEDULED_DOWNTIME, TRUE, temp_downtime->start_time, FALSE, 0, NULL, FALSE, (void *)new_downtime_id, NULL, 0); - /* Turn off is_in_effect flag so handle_scheduled_downtime() will + /* Turn off is_in_effect flag so handle_scheduled_downtime() will handle it correctly */ was_in_effect = temp_downtime->is_in_effect; temp_downtime->is_in_effect = FALSE; @@ -350,14 +350,14 @@ else svc->pending_flex_downtime++; temp_downtime->incremented_pending_downtime = TRUE; - + /* Since a flex downtime may never start, schedule an expiring event in case the event is never triggered. The expire event will NOT cancel a downtime event that is in effect */ log_debug_info(DEBUGL_DOWNTIME, 1, "Scheduling downtime expire event in case flexible downtime is never triggered\n"); temp_downtime->stop_event = schedule_new_event(EVENT_EXPIRE_DOWNTIME, TRUE, (temp_downtime->end_time + 1), FALSE, 0, NULL, FALSE, NULL, NULL, 0); } - + #ifdef PROBABLY_NOT_NEEDED /*** FLEXIBLE DOWNTIME SANITY CHECK - ADDED 02/17/2008 ****/ @@ -381,18 +381,18 @@ scheduled_downtime *temp_downtime = NULL; log_debug_info(DEBUGL_FUNCTIONS, 0, "handle_scheduled_downtime_by_id()\n"); - + /* find the downtime entry */ if((temp_downtime = find_downtime(ANY_DOWNTIME, downtime_id)) == NULL) { - log_debug_info(DEBUGL_DOWNTIME, 1, "Unable to find downtime id: %lu\n", + log_debug_info(DEBUGL_DOWNTIME, 1, "Unable to find downtime id: %lu\n", downtime_id); return ERROR; } - /* NULL out this event's start time since the calling function, - handle_timed_event(), will free the event, this will prevent + /* NULL out this event's start time since the calling function, + handle_timed_event(), will free the event, this will prevent unschedule_downtime from freeing something that has already been - freed. The start event is not needed within + freed. The start event is not needed within handle_scheduled_downtime(). */ temp_downtime->start_event = NULL; @@ -564,7 +564,7 @@ /* schedule an event to end the downtime */ if(temp_downtime->fixed == FALSE) { - event_time = (time_t)((unsigned long)temp_downtime->flex_downtime_start + event_time = (time_t)((unsigned long)temp_downtime->flex_downtime_start + temp_downtime->duration); } else { @@ -784,7 +784,7 @@ log_debug_info(DEBUGL_FUNCTIONS, 0, "add_new_service_downtime()\n"); if(host_name == NULL || service_description == NULL) { - log_debug_info(DEBUGL_DOWNTIME, 1, + log_debug_info(DEBUGL_DOWNTIME, 1, "Host name (%s) or service description (%s) is null\n", ((NULL == host_name) ? "null" : host_name), ((NULL == service_description) ? "null" : service_description)); @@ -980,14 +980,14 @@ /* don't add triggered downtimes that don't have a valid parent */ if(triggered_by > 0 && find_downtime(ANY_DOWNTIME, triggered_by) == NULL) { - log_debug_info(DEBUGL_DOWNTIME, 1, + log_debug_info(DEBUGL_DOWNTIME, 1, "Downtime is triggered, but has no valid parent\n"); return ERROR; } /* we don't have enough info */ if(host_name == NULL || (downtime_type == SERVICE_DOWNTIME && svc_description == NULL)) { - log_debug_info(DEBUGL_DOWNTIME, 1, + log_debug_info(DEBUGL_DOWNTIME, 1, "Host name (%s) or service description (%s) is null\n", ((NULL == host_name) ? "null" : host_name), ((NULL == svc_description) ? "null" : svc_description)); @@ -996,34 +996,34 @@ /* allocate memory for the downtime */ if((new_downtime = (scheduled_downtime *)calloc(1, sizeof(scheduled_downtime))) == NULL) { - log_debug_info(DEBUGL_DOWNTIME, 1, + log_debug_info(DEBUGL_DOWNTIME, 1, "Unable to allocate memory for new downtime\n"); return ERROR; } /* duplicate vars */ if((new_downtime->host_name = (char *)strdup(host_name)) == NULL) { - log_debug_info(DEBUGL_DOWNTIME, 1, + log_debug_info(DEBUGL_DOWNTIME, 1, "Unable to allocate memory for new downtime's host name\n"); result = ERROR; } if(downtime_type == SERVICE_DOWNTIME) { if((new_downtime->service_description = (char *)strdup(svc_description)) == NULL) { - log_debug_info(DEBUGL_DOWNTIME, 1, + log_debug_info(DEBUGL_DOWNTIME, 1, "Unable to allocate memory for new downtime's service description\n"); result = ERROR; } } if(author) { if((new_downtime->author = (char *)strdup(author)) == NULL) { - log_debug_info(DEBUGL_DOWNTIME, 1, + log_debug_info(DEBUGL_DOWNTIME, 1, "Unable to allocate memory for new downtime's author\n"); result = ERROR; } } if(comment_data) { if((new_downtime->comment = (char *)strdup(comment_data)) == NULL) { - log_debug_info(DEBUGL_DOWNTIME, 1, + log_debug_info(DEBUGL_DOWNTIME, 1, "Unable to allocate memory for new downtime's comment\n"); result = ERROR; } @@ -1149,8 +1149,8 @@ log_debug_info(DEBUGL_FUNCTIONS, 0, "find_downtime()\n"); for(temp_downtime = scheduled_downtime_list; temp_downtime != NULL; temp_downtime = temp_downtime->next) { - log_debug_info(DEBUGL_DOWNTIME, 2, - "find_downtime() looking at type %d, id: %lu\n", type, + log_debug_info(DEBUGL_DOWNTIME, 2, + "find_downtime() looking at type %d, id: %lu\n", type, downtime_id); if(type != ANY_DOWNTIME && temp_downtime->type != type) continue; Modified: nagioscore/trunk/include/cgiauth.h =================================================================== --- nagioscore/trunk/include/cgiauth.h 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/include/cgiauth.h 2013-04-07 15:42:12 UTC (rev 2729) @@ -57,7 +57,7 @@ int is_authorized_for_hostgroup(hostgroup *, authdata *); int is_authorized_for_servicegroup(servicegroup *, authdata *); - + int is_authorized_for_hostgroup_commands(hostgroup *, authdata *); int is_authorized_for_servicegroup_commands(servicegroup *, authdata *); Modified: nagioscore/trunk/include/cgiutils.h =================================================================== --- nagioscore/trunk/include/cgiutils.h 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/include/cgiutils.h 2013-04-07 15:42:12 UTC (rev 2729) @@ -77,7 +77,7 @@ #define SUMMARY_CSS "summary.css" /********************************* JAVASCRIPT INCLUDES **********************/ -#define JQUERY_JS "jquery-1.7.1.min.js" +#define JQUERY_JS "jquery-1.7.1.min.js" /********************************* ICONS ************************************/ Modified: nagioscore/trunk/include/getcgi.h =================================================================== --- nagioscore/trunk/include/getcgi.h 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/include/getcgi.h 2013-04-07 15:42:12 UTC (rev 2729) @@ -10,7 +10,7 @@ #define ACCEPT_LANGUAGE_Q_DELIMITER ";q=" -/* information for a single language in the variable HTTP_ACCEPT_LANGUAGE +/* information for a single language in the variable HTTP_ACCEPT_LANGUAGE sent by the browser */ typedef struct accept_language_struct { char * language; @@ -18,7 +18,7 @@ double q; } accept_language; -/* information for all languages in the variable HTTP_ACCEPT_LANGUAGE +/* information for all languages in the variable HTTP_ACCEPT_LANGUAGE sent by the browser */ typedef struct accept_languages_struct { int count; Modified: nagioscore/trunk/lib/bitmap.c =================================================================== --- nagioscore/trunk/lib/bitmap.c 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/lib/bitmap.c 2013-04-07 15:42:12 UTC (rev 2729) @@ -264,7 +264,7 @@ return res; } -/* +/* * Remove all elements from a that are also in b. */ bitmap *bitmap_minus(const bitmap *a, const bitmap *b) Modified: nagioscore/trunk/lib/test-iobroker.c =================================================================== --- nagioscore/trunk/lib/test-iobroker.c 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/lib/test-iobroker.c 2013-04-07 15:42:12 UTC (rev 2729) @@ -152,7 +152,7 @@ error = iobroker_get_max_fds(NULL); ok_int(error, IOBROKER_ENOSET, "test errors when passing null"); - + err_msg = iobroker_strerror(error); test(err_msg && !strcmp(err_msg, iobroker_errors[(~error) + 1].string), "iobroker_strerror() returns the right string"); Modified: nagioscore/trunk/worker/ping/worker-ping.c =================================================================== --- nagioscore/trunk/worker/ping/worker-ping.c 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/worker/ping/worker-ping.c 2013-04-07 15:42:12 UTC (rev 2729) @@ -73,8 +73,8 @@ if( TRUE == daemon_mode) { if( daemon_init() == ERROR) { - fprintf( stderr, - "Bailing out due to failure to daemonize. (PID=%d)\n", + fprintf( stderr, + "Bailing out due to failure to daemonize. (PID=%d)\n", ( int)getpid()); exit( 1); } @@ -86,8 +86,8 @@ } } -void parse_worker_command_line( int argc, char **argv, char **env, - int *daemon_mode, char **worker_socket, char **worker_user, +void parse_worker_command_line( int argc, char **argv, char **env, + int *daemon_mode, char **worker_socket, char **worker_user, char **worker_group) { int c = 0; int display_usage = FALSE; @@ -142,7 +142,7 @@ break; case ':': - printf( "Missing argument for command line option '%c'.\n\n", + printf( "Missing argument for command line option '%c'.\n\n", optopt); print_usage( argv[ 0]); exit( 1); @@ -252,7 +252,7 @@ struct passwd *pw = NULL; int result = PW_OK; - /* only drop privileges if we're running as root, so we don't + /* only drop privileges if we're running as root, so we don't interfere with being debugged while running as some random user */ if( getuid() != 0) { return PW_OK; @@ -268,7 +268,7 @@ gid = ( gid_t)(grp->gr_gid); } else { - fprintf( stderr, + fprintf( stderr, "Warning: Could not get group entry for '%s'\n", group); } } @@ -281,7 +281,7 @@ /* set effective group ID if other than current EGID */ if( gid != getegid()) { if( setgid( gid) == -1) { - fprintf( stderr, "Warning: Could not set effective GID=%d\n", + fprintf( stderr, "Warning: Could not set effective GID=%d\n", ( int)gid); result = PW_ERROR; } @@ -298,7 +298,7 @@ uid = ( uid_t)(pw->pw_uid); } else { - fprintf( stderr, + fprintf( stderr, "Warning: Could not get passwd entry for '%s'\n", user); } } @@ -328,7 +328,7 @@ } #endif if( setuid( uid) == -1) { - fprintf( stderr, "Warning: Could not set effective UID=%d\n", + fprintf( stderr, "Warning: Could not set effective UID=%d\n", ( int)uid); result = PW_ERROR; } @@ -377,7 +377,7 @@ open( "/dev/null", O_WRONLY); #ifdef USE_LOCKFILE - lockfile = open( lock_file, + lockfile = open( lock_file, O_RDWR | O_CREAT, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH); if( lockfile < 0) { Modified: nagioscore/trunk/xdata/xdddefault.c =================================================================== --- nagioscore/trunk/xdata/xdddefault.c 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/xdata/xdddefault.c 2013-04-07 15:42:12 UTC (rev 2729) @@ -89,7 +89,7 @@ /* delete downtimes with invalid host names */ if(find_host(temp_downtime->host_name) == NULL) { - log_debug_info(DEBUGL_DOWNTIME, 1, + log_debug_info(DEBUGL_DOWNTIME, 1, "Deleting downtime with invalid host name: %s\n", temp_downtime->host_name); save = FALSE; @@ -97,26 +97,26 @@ /* delete downtimes with invalid service descriptions */ if(temp_downtime->type == SERVICE_DOWNTIME && find_service(temp_downtime->host_name, temp_downtime->service_description) == NULL) { - log_debug_info(DEBUGL_DOWNTIME, 1, + log_debug_info(DEBUGL_DOWNTIME, 1, "Deleting downtime with invalid service description: %s\n", temp_downtime->service_description); save = FALSE; } /* delete fixed downtimes that have expired */ - if((TRUE == temp_downtime->fixed) && + if((TRUE == temp_downtime->fixed) && (temp_downtime->end_time < time(NULL))) { - log_debug_info(DEBUGL_DOWNTIME, 1, + log_debug_info(DEBUGL_DOWNTIME, 1, "Deleting fixed downtime that expired at: %lu\n", temp_downtime->end_time); save = FALSE; } /* delete flexible downtimes that never started and have expired */ - if((FALSE == temp_downtime->fixed) && + if((FALSE == temp_downtime->fixed) && (0 == temp_downtime->flex_downtime_start) && (temp_downtime->end_time < time(NULL))) { - log_debug_info(DEBUGL_DOWNTIME, 1, + log_debug_info(DEBUGL_DOWNTIME, 1, "Deleting flexible downtime that expired at: %lu\n", temp_downtime->end_time); save = FALSE; @@ -124,11 +124,11 @@ /* delete flexible downtimes that started but whose duration has completed */ - if((FALSE == temp_downtime->fixed) && + if((FALSE == temp_downtime->fixed) && (0 != temp_downtime->flex_downtime_start) && - ((temp_downtime->flex_downtime_start + temp_downtime->duration) + ((temp_downtime->flex_downtime_start + temp_downtime->duration) < time(NULL))) { - log_debug_info(DEBUGL_DOWNTIME, 1, + log_debug_info(DEBUGL_DOWNTIME, 1, "Deleting flexible downtime whose duration ended at: %lu\n", temp_downtime->flex_downtime_start + temp_downtime->duration); save = FALSE; Modified: nagioscore/trunk/xdata/xodtemplate.c =================================================================== --- nagioscore/trunk/xdata/xodtemplate.c 2013-04-07 15:41:22 UTC (rev 2728) +++ nagioscore/trunk/xdata/xodtemplate.c 2013-04-07 15:42:12 UTC (rev 2729) @@ -6461,7 +6461,7 @@ if(!(sg = xodtemplate_find_real_servicegroup(ptr))) { logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Could not find member group '%s' specified in servicegroup '%s' (config file '%s', starting on line %d)\n", ptr, temp_servicegroup->servicegroup_name, xodtemplate_config_file_name(temp_servicegroup->_config_file), temp_servicegroup->_start_line); return ERROR; - + } add_object_to_objectlist(&temp_servicegroup->group_list, sg); if(!next_ptr) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |