Update of /cvsroot/nagios/nagios/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30777/common
Modified Files:
comments.c downtime.c objects.c statusdata.c
Log Message:
Misc cleanups
Index: downtime.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/downtime.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** downtime.c 6 Nov 2004 05:44:13 -0000 1.23
--- downtime.c 13 Jun 2005 04:23:05 -0000 1.24
***************
*** 3,8 ****
* DOWNTIME.C - Scheduled downtime functions for Nagios
*
! * Copyright (c) 2000-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 11-05-2004
*
* License:
--- 3,8 ----
* DOWNTIME.C - Scheduled downtime functions for Nagios
*
! * Copyright (c) 2000-2005 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 06-12-2005
*
* License:
***************
*** 70,76 ****
result=xdddefault_initialize_downtime_data(config_file);
#endif
- #ifdef USE_XDDDB
- result=xdddb_initialize_downtime_data(config_file);
- #endif
return result;
--- 70,73 ----
***************
*** 86,92 ****
result=xdddefault_cleanup_downtime_data(config_file);
#endif
- #ifdef USE_XDDDB
- result=xdddb_cleanup_downtime_data(config_file);
- #endif
/* free memory allocated to downtime data */
--- 83,86 ----
***************
*** 645,651 ****
result=xdddefault_add_new_host_downtime(host_name,entry_time,author,comment_data,start_time,end_time,fixed,triggered_by,duration,&new_downtime_id);
#endif
- #ifdef USE_XDDDB
-
result=xdddb_add_new_host_downtime(host_name,entry_time,author,comment_data,start_time,end_time,fixed,triggered_by,duration,&new_downtime_id);
- #endif
/* save downtime id */
--- 639,642 ----
***************
*** 674,680 ****
result=xdddefault_add_new_service_downtime(host_name,service_description,entry_time,author,comment_data,start_time,end_time,fixed,triggered_by,duration,&new_downtime_id);
#endif
- #ifdef USE_XDDDB
-
result=xdddb_add_new_service_downtime(host_name,service_description,entry_time,author,comment_data,start_time,end_time,fixed,triggered_by,duration,&new_downtime_id);
- #endif
/* save downtime id */
--- 665,668 ----
***************
*** 761,767 ****
result=xdddefault_delete_host_downtime(downtime_id);
#endif
- #ifdef USE_XDDDB
- result=xdddb_delete_host_downtime(downtime_id,FALSE);
- #endif
return result;
--- 749,752 ----
***************
*** 780,786 ****
result=xdddefault_delete_service_downtime(downtime_id);
#endif
- #ifdef USE_XDDDB
- result=xdddb_delete_service_downtime(downtime_id,FALSE);
- #endif
return result;
--- 765,768 ----
***************
*** 805,811 ****
result=xdddefault_read_downtime_data(main_config_file);
#endif
- #ifdef USE_XDDDB
- result=xdddb_read_downtime_data(main_config_file);
- #endif
return result;
--- 787,790 ----
Index: statusdata.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/statusdata.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** statusdata.c 25 Oct 2004 05:05:56 -0000 1.20
--- statusdata.c 13 Jun 2005 04:23:23 -0000 1.21
***************
*** 3,8 ****
* STATUSDATA.C - External status data for Nagios CGIs
*
! * Copyright (c) 2000-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 10-24-2004
*
* License:
--- 3,8 ----
* STATUSDATA.C - External status data for Nagios CGIs
*
! * Copyright (c) 2000-2005 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 06-12-2005
*
* License:
***************
*** 44,50 ****
#include "../xdata/xsddefault.h" /* default routines */
#endif
- #ifdef USE_XSDDB
- #include "../xdata/xsddb.h" /* database routines */
- #endif
--- 44,47 ----
***************
*** 79,85 ****
result=xsddefault_initialize_status_data(config_file);
#endif
- #ifdef USE_XSDDB
- result=xsddb_initialize_status_data(config_file);
- #endif
return result;
--- 76,79 ----
***************
*** 95,101 ****
result=xsddefault_save_status_data();
#endif
- #ifdef USE_XSDDB
- result=xsddb_save_status_data();
- #endif
if(result!=OK)
--- 89,92 ----
***************
*** 114,120 ****
result=xsddefault_cleanup_status_data(config_file,delete_status_data);
#endif
- #ifdef USE_XSDDB
- result=xsddb_cleanup_status_data(config_file,delete_status_data);
- #endif
return result;
--- 105,108 ----
***************
*** 127,132 ****
#ifdef USE_EVENT_BROKER
! /* send data to event broker */
!
broker_program_status(NEBTYPE_PROGRAMSTATUS_UPDATE,NEBFLAG_NONE,NEBATTR_NONE,NULL);
#endif
--- 115,121 ----
#ifdef USE_EVENT_BROKER
! /* send data to event broker (non-aggregated dumps only) */
! if(aggregated_dump==FALSE)
!
broker_program_status(NEBTYPE_PROGRAMSTATUS_UPDATE,NEBFLAG_NONE,NEBATTR_NONE,NULL);
#endif
***************
*** 146,151 ****
#ifdef USE_EVENT_BROKER
! /* send data to event broker */
!
broker_host_status(NEBTYPE_HOSTSTATUS_UPDATE,NEBFLAG_NONE,NEBATTR_NONE,hst,NULL);
#endif
--- 135,141 ----
#ifdef USE_EVENT_BROKER
! /* send data to event broker (non-aggregated dumps only) */
! if(aggregated_dump==FALSE)
!
broker_host_status(NEBTYPE_HOSTSTATUS_UPDATE,NEBFLAG_NONE,NEBATTR_NONE,hst,NULL);
#endif
***************
*** 165,170 ****
#ifdef USE_EVENT_BROKER
! /* send data to event broker */
!
broker_service_status(NEBTYPE_SERVICESTATUS_UPDATE,NEBFLAG_NONE,NEBATTR_NONE,svc,NULL);
#endif
--- 155,161 ----
#ifdef USE_EVENT_BROKER
! /* send data to event broker (non-aggregated dumps only) */
! if(aggregated_dump==FALSE)
!
broker_service_status(NEBTYPE_SERVICESTATUS_UPDATE,NEBFLAG_NONE,NEBATTR_NONE,svc,NULL);
#endif
Index: objects.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/objects.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** objects.c 6 Jun 2005 03:20:57 -0000 1.66
--- objects.c 13 Jun 2005 04:23:23 -0000 1.67
***************
*** 4,8 ****
*
* Copyright (c) 1999-2005 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 05-26-2005
*
* License:
--- 4,8 ----
*
* Copyright (c) 1999-2005 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 06-12-2005
*
* License:
***************
*** 874,878 ****
if(day<0 || day>6){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Day %d is
not value for timeperiod '%s'\n",day,period->name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 874,878 ----
if(day<0 || day>6){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Day %d is
not valid for timeperiod '%s'\n",day,period->name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
***************
*** 882,886 ****
if(start_time<0 || start_time>86400){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Start time
%lu on day %d is not value for timeperiod '%s'\n",start_time,day,period->name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 882,886 ----
if(start_time<0 || start_time>86400){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Start time
%lu on day %d is not valid for timeperiod '%s'\n",start_time,day,period->name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
Index: comments.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/comments.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** comments.c 6 Nov 2004 05:44:12 -0000 1.14
--- comments.c 13 Jun 2005 04:23:05 -0000 1.15
***************
*** 3,8 ****
* COMMENTS.C - Comment functions for Nagios
*
! * Copyright (c) 1999-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 11-05-2004
*
* License:
--- 3,8 ----
* COMMENTS.C - Comment functions for Nagios
*
! * Copyright (c) 1999-2005 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 06-12-2005
*
* License:
***************
*** 34,40 ****
#include "../xdata/xcddefault.h"
#endif
- #ifdef USE_XCDDB
- #include "../xdata/xcddb.h"
- #endif
#ifdef NSCORE
--- 34,37 ----
***************
*** 69,75 ****
result=xcddefault_initialize_comment_data(config_file);
#endif
- #ifdef USE_XCDDB
- result=xcddb_initialize_comment_data(config_file);
- #endif
return result;
--- 66,69 ----
***************
*** 85,91 ****
result=xcddefault_cleanup_comment_data(config_file);
#endif
- #ifdef USE_XCDDB
- result=xcddb_cleanup_comment_data(config_file);
- #endif
return result;
--- 79,82 ----
***************
*** 128,134 ****
result=xcddefault_add_new_host_comment(entry_type,host_name,entry_time,author_name,comment_data,persistent,source,expires,expire_time,&new_comment_id);
#endif
- #ifdef USE_XCDDB
-
result=xcddb_add_new_host_comment(entry_type,host_name,entry_time,author_name,comment_data,persistent,source,expires,expire_time,&new_comment_id);
- #endif
/* save comment id */
--- 119,122 ----
***************
*** 154,160 ****
result=xcddefault_add_new_service_comment(entry_type,host_name,svc_description,entry_time,author_name,comment_data,persistent,source,expires,expire_time,&new_comment_id);
#endif
- #ifdef USE_XCDDB
-
result=xcddb_add_new_service_comment(entry_type,host_name,svc_description,entry_time,author_name,comment_data,persistent,source,expires,expire_time,&new_comment_id);
- #endif
/* save comment id */
--- 142,145 ----
***************
*** 253,259 ****
result=xcddefault_delete_host_comment(comment_id);
#endif
- #ifdef USE_XCDDB
- result=xcddb_delete_host_comment(comment_id,FALSE);
- #endif
return result;
--- 238,241 ----
***************
*** 273,279 ****
result=xcddefault_delete_service_comment(comment_id);
#endif
- #ifdef USE_XCDDB
- result=xcddb_delete_service_comment(comment_id,FALSE);
- #endif
return result;
--- 255,258 ----
***************
*** 312,318 ****
result=xcddefault_delete_all_host_comments(host_name);
#endif
- #ifdef USE_XCDDB
- result=xcddb_delete_all_host_comments(host_name);
- #endif
return result;
--- 291,294 ----
***************
*** 338,344 ****
result=xcddefault_delete_all_service_comments(host_name,svc_description);
#endif
- #ifdef USE_XCDDB
- result=xcddb_delete_all_service_comments(host_name,svc_description);
- #endif
return result;
--- 314,317 ----
***************
*** 365,371 ****
result=xcddefault_read_comment_data(main_config_file);
#endif
- #ifdef USE_XCDDB
- result=xcddb_read_comment_data(main_config_file);
- #endif
return result;
--- 338,341 ----
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
|
