From: <ag...@us...> - 2013-04-07 15:44:23
|
Revision: 2731 http://nagios.svn.sourceforge.net/nagios/?rev=2731&view=rev Author: ageric Date: 2013-04-07 15:44:11 +0000 (Sun, 07 Apr 2013) Log Message: ----------- Declare const strings as const This allows the compiler to optimize things better. Function calls in particular benefit hugely from this. As a nice sideeffect, we get a neat hint about which functions have a tendency to modify their arguments and which don't. Signed-off-by: Andreas Ericsson <ae...@op...> Modified Paths: -------------- nagioscore/trunk/base/nagiostats.c nagioscore/trunk/base/nerd.c nagioscore/trunk/base/netutils.c nagioscore/trunk/base/perfdata.c nagioscore/trunk/base/sretention.c nagioscore/trunk/base/utils.c nagioscore/trunk/cgi/avail.c nagioscore/trunk/cgi/cgiutils.c nagioscore/trunk/cgi/config.c nagioscore/trunk/cgi/extinfo.c nagioscore/trunk/cgi/outages.c nagioscore/trunk/cgi/status.c nagioscore/trunk/cgi/summary.c nagioscore/trunk/common/downtime.c nagioscore/trunk/common/objects.c nagioscore/trunk/common/shared.c nagioscore/trunk/common/statusdata.c nagioscore/trunk/include/cgiutils.h nagioscore/trunk/include/nagios.h nagioscore/trunk/include/netutils.h nagioscore/trunk/include/objects.h nagioscore/trunk/include/perfdata.h nagioscore/trunk/include/shared.h nagioscore/trunk/include/sretention.h nagioscore/trunk/include/statusdata.h nagioscore/trunk/lib/iobroker.c nagioscore/trunk/lib/kvvec.c nagioscore/trunk/lib/kvvec.h nagioscore/trunk/lib/worker.c nagioscore/trunk/xdata/xodtemplate.c nagioscore/trunk/xdata/xodtemplate.h nagioscore/trunk/xdata/xpddefault.c nagioscore/trunk/xdata/xpddefault.h nagioscore/trunk/xdata/xrddefault.c nagioscore/trunk/xdata/xrddefault.h nagioscore/trunk/xdata/xsddefault.c nagioscore/trunk/xdata/xsddefault.h Modified: nagioscore/trunk/base/nagiostats.c =================================================================== --- nagioscore/trunk/base/nagiostats.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/base/nagiostats.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -38,7 +38,7 @@ static char *main_config_file = NULL; static char *status_file = NULL; static char *mrtg_variables = NULL; -static char *mrtg_delimiter = "\n"; +static const char *mrtg_delimiter = "\n"; static int mrtg_mode = FALSE; Modified: nagioscore/trunk/base/nerd.c =================================================================== --- nagioscore/trunk/base/nerd.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/base/nerd.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -474,7 +474,7 @@ int nerd_init(void) { nerd_mod.deinit_func = nerd_deinit; - nerd_mod.filename = "NERD"; /* something to log */ + nerd_mod.filename = (char *)"NERD"; /* something to log */ if(qh_register_handler("nerd", "Nagios Event Radio Dispatcher - Subscriber Service", 0, nerd_qh_handler) < 0) { logit(NSLOG_RUNTIME_ERROR, TRUE, "nerd: Failed to register with query handler\n"); Modified: nagioscore/trunk/base/netutils.c =================================================================== --- nagioscore/trunk/base/netutils.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/base/netutils.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -27,7 +27,7 @@ /* connect to a TCP socket in nonblocking fashion */ -int my_tcp_connect(char *host_name, int port, int *sd, int timeout) { +int my_tcp_connect(const char *host_name, int port, int *sd, int timeout) { struct addrinfo hints; struct addrinfo *res; int result; @@ -152,7 +152,7 @@ /* based on Beej's sendall - thanks Beej! */ -int my_sendall(int s, char *buf, int *len, int timeout) { +int my_sendall(int s, const char *buf, int *len, int timeout) { int total_sent = 0; int bytes_left = 0; int n; Modified: nagioscore/trunk/base/perfdata.c =================================================================== --- nagioscore/trunk/base/perfdata.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/base/perfdata.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -41,7 +41,7 @@ /******************************************************************/ /* initializes performance data */ -int initialize_performance_data(char *cfgfile) { +int initialize_performance_data(const char *cfgfile) { #ifdef USE_XPDDEFAULT xpddefault_initialize_performance_data(cfgfile); Modified: nagioscore/trunk/base/sretention.c =================================================================== --- nagioscore/trunk/base/sretention.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/base/sretention.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -47,7 +47,7 @@ /* initializes retention data at program start */ -int initialize_retention_data(char *cfgfile) { +int initialize_retention_data(const char *cfgfile) { int result = OK; /**** IMPLEMENTATION-SPECIFIC CALLS ****/ Modified: nagioscore/trunk/base/utils.c =================================================================== --- nagioscore/trunk/base/utils.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/base/utils.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -2267,7 +2267,7 @@ /* gets the next string from a buffer in memory - strings are terminated by newlines, which are removed */ char *get_next_string_from_buf(char *buf, int *start_index, int bufsize) { char *sptr = NULL; - char *nl = "\n"; + const char *nl = "\n"; int x; if(buf == NULL || start_index == NULL) @@ -2549,7 +2549,7 @@ /* dynamically expands a string */ -int dbuf_strcat(dbuf *db, char *buf) { +int dbuf_strcat(dbuf *db, const char *buf) { char *newbuf = NULL; unsigned long buflen = 0L; unsigned long new_size = 0L; @@ -2935,8 +2935,8 @@ /* checks for updates at api.nagios.org */ int query_update_api(void) { - char *api_server = "api.nagios.org"; - char *api_path = "/versioncheck/"; + const char *api_server = "api.nagios.org"; + const char *api_path = "/versioncheck/"; char *api_query = NULL; char *api_query_opts = NULL; char *buf = NULL; Modified: nagioscore/trunk/cgi/avail.c =================================================================== --- nagioscore/trunk/cgi/avail.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/cgi/avail.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -222,14 +222,14 @@ void get_running_average(double *, double, int); -void host_report_url(char *, char *); -void service_report_url(char *, char *, char *); +void host_report_url(const char *, const char *); +void service_report_url(const char *, const char *, const char *); void compute_report_times(void); int convert_host_state_to_archived_state(int); int convert_service_state_to_archived_state(int); -void add_global_archived_state(int, int, time_t, char *); -void add_archived_state(int, int, time_t, char *, avail_subject *); +void add_global_archived_state(int, int, time_t, const char *); +void add_archived_state(int, int, time_t, const char *, avail_subject *); void add_scheduled_downtime(int, time_t, avail_subject *); void free_availability_data(void); void free_archived_state_list(archived_state *); @@ -2446,7 +2446,7 @@ servicesmember *temp_sgmember; host *temp_host; service *temp_service; - char *last_host_name = ""; + const char *last_host_name = ""; /* we're displaying one or more hosts */ if(display_type == DISPLAY_HOST_AVAIL && host_name && strcmp(host_name, "")) { @@ -2655,7 +2655,7 @@ /* adds an archived state entry to all subjects */ -void add_global_archived_state(int entry_type, int state_type, time_t time_stamp, char *state_info) { +void add_global_archived_state(int entry_type, int state_type, time_t time_stamp, const char *state_info) { avail_subject *temp_subject; for(temp_subject = subject_list; temp_subject != NULL; temp_subject = temp_subject->next) @@ -2668,7 +2668,7 @@ /* adds an archived state entry to a specific subject */ -void add_archived_state(int entry_type, int state_type, time_t time_stamp, char *state_info, avail_subject *subject) { +void add_archived_state(int entry_type, int state_type, time_t time_stamp, const char *state_info, avail_subject *subject) { archived_state *last_as = NULL; archived_state *temp_as = NULL; archived_state *new_as = NULL; @@ -3214,10 +3214,10 @@ char start_date_time[MAX_DATETIME_LENGTH]; char end_date_time[MAX_DATETIME_LENGTH]; char duration[20]; - char *bgclass = ""; - char *ebgclass = ""; - char *entry_type = ""; - char *state_type = ""; + const char *bgclass = ""; + const char *ebgclass = ""; + const char *entry_type = ""; + const char *state_type = ""; int days; int hours; int minutes; @@ -3447,7 +3447,7 @@ int current_subject = 0; - char *bgclass = ""; + const char *bgclass = ""; int odd = 1; host *temp_host; @@ -3607,7 +3607,7 @@ int current_subject = 0; - char *bgclass = ""; + const char *bgclass = ""; int odd = 1; host *temp_host; service *temp_service; @@ -3884,7 +3884,7 @@ int current_subject = 0; - char *bgclass = ""; + const char *bgclass = ""; int odd = 1; /* calculate total time during period based on timeperiod used for reporting */ @@ -4358,7 +4358,7 @@ double percent_time_indeterminate_nodata = 0.0; int odd = 1; - char *bgclass = ""; + const char *bgclass = ""; char last_host[128] = ""; @@ -4709,7 +4709,7 @@ -void host_report_url(char *hn, char *label) { +void host_report_url(const char *hn, const char *label) { printf("<a href='%s?host=%s", AVAIL_CGI, url_encode(hn)); printf("&show_log_entries"); @@ -4733,7 +4733,7 @@ } -void service_report_url(char *hn, char *sd, char *label) { +void service_report_url(const char *hn, const char *sd, const char *label) { printf("<a href='%s?host=%s", AVAIL_CGI, url_encode(hn)); printf("&service=%s", url_encode(sd)); Modified: nagioscore/trunk/cgi/cgiutils.c =================================================================== --- nagioscore/trunk/cgi/cgiutils.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/cgi/cgiutils.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -210,7 +210,7 @@ **********************************************************/ /* read the CGI config file location from an environment variable */ -char * get_cgi_config_location(void) { +const char *get_cgi_config_location(void) { static char *cgiloc = NULL; if(!cgiloc) { @@ -224,7 +224,7 @@ /* read the command file location from an environment variable */ -char * get_cmd_file_location(void) { +const char *get_cmd_file_location(void) { static char *cmdloc = NULL; if(!cmdloc) { @@ -237,7 +237,7 @@ /*read the CGI configuration file */ -int read_cgi_config_file(char *filename) { +int read_cgi_config_file(const char *filename) { char *input = NULL; mmapfile *thefile; char *var = NULL; @@ -423,7 +423,7 @@ /* read the main configuration file */ -int read_main_config_file(char *filename) { +int read_main_config_file(const char *filename) { char *input = NULL; char *temp_buffer; mmapfile *thefile; @@ -529,7 +529,7 @@ /* read all object definitions */ -int read_all_object_configuration_data(char *cfgfile, int options) { +int read_all_object_configuration_data(const char *cfgfile, int options) { int result = OK; /* read in all external config data of the desired type(s) */ @@ -540,7 +540,7 @@ /* read all status data */ -int read_all_status_data(char *cfgfile, int options) { +int read_all_status_data(const char *cfgfile, int options) { int result = OK; /* don't duplicate things we've already read in */ @@ -785,9 +785,9 @@ int month = 0; int day = 0; int year = 0; - char *weekdays[7] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; - char *months[12] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - char *tzone = ""; + const char *weekdays[7] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; + const char *months[12] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; + const char *tzone = ""; if(raw_time == NULL) time(&t); @@ -871,7 +871,7 @@ /* encodes a string in proper URL format */ -char *url_encode(char *input) { +const char *url_encode(const char *input) { int len, output_len; int x, y; char temp_expansion[4]; @@ -1065,7 +1065,7 @@ /* escape string for html form usage */ -char *escape_string(char *input) { +char *escape_string(const char *input) { int len; int output_max; wchar_t wctemp[1]; @@ -1305,7 +1305,7 @@ *************** COMMON HTML FUNCTIONS ******************** **********************************************************/ -void display_info_table(char *title, int refresh, authdata *current_authdata) { +void display_info_table(const char *title, int refresh, authdata *current_authdata) { time_t current_time; char date_time[MAX_DATETIME_LENGTH]; int result; @@ -1520,7 +1520,7 @@ /* include user-defined SSI footers or headers */ -void include_ssi_files(char *cgi_name, int type) { +void include_ssi_files(const char *cgi_name, int type) { char common_ssi_file[MAX_INPUT_BUFFER]; char cgi_ssi_file[MAX_INPUT_BUFFER]; char raw_cgi_name[MAX_INPUT_BUFFER]; @@ -1554,7 +1554,7 @@ /* include user-defined SSI footer or header */ -void include_ssi_file(char *filename) { +void include_ssi_file(const char *filename) { char buffer[MAX_INPUT_BUFFER]; FILE *fp; struct stat stat_result; @@ -1616,7 +1616,7 @@ /* displays an error if CGI config file could not be read */ -void cgi_config_file_error(char *config_file) { +void cgi_config_file_error(const char *config_file) { printf("<H1>Whoops!</H1>\n"); @@ -1645,7 +1645,7 @@ /* displays an error if main config file could not be read */ -void main_config_file_error(char *config_file) { +void main_config_file_error(const char *config_file) { printf("<H1>Whoops!</H1>\n"); @@ -1735,8 +1735,8 @@ /* displays context-sensitive help window */ -void display_context_help(char *chid) { - char *icon = CONTEXT_HELP_ICON1; +void display_context_help(const char *chid) { + const char *icon = CONTEXT_HELP_ICON1; if(show_context_help == FALSE) return; Modified: nagioscore/trunk/cgi/config.c =================================================================== --- nagioscore/trunk/cgi/config.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/cgi/config.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -85,7 +85,7 @@ int embedded = FALSE; static void print_expand_input(int type) { - char *seldesc = ""; + const char *seldesc = ""; if(type == DISPLAY_COMMAND_EXPANSION) return; /* Has its own form, w/ larger <input> */ else if(type == DISPLAY_SERVICES) { @@ -450,7 +450,7 @@ int options = 0; int odd = 0; char time_string[16]; - char *bg_class = ""; + const char *bg_class = ""; int contact = 0; /* see if user is authorized to view host information... */ @@ -774,7 +774,7 @@ hostgroup *temp_hostgroup; hostsmember *temp_hostsmember; int odd = 0; - char *bg_class = ""; + const char *bg_class = ""; /* see if user is authorized to view hostgroup information... */ if(is_authorized_for_configuration_information(¤t_authdata) == FALSE) { @@ -849,7 +849,7 @@ servicegroup *temp_servicegroup; servicesmember *temp_servicesmember; int odd = 0; - char *bg_class = ""; + const char *bg_class = ""; /* see if user is authorized to view servicegroup information... */ if(is_authorized_for_configuration_information(¤t_authdata) == FALSE) { @@ -928,7 +928,7 @@ int odd = 0; int options; int found; - char *bg_class = ""; + const char *bg_class = ""; /* see if user is authorized to view contact information... */ if(is_authorized_for_configuration_information(¤t_authdata) == FALSE) { @@ -1111,7 +1111,7 @@ contactgroup *temp_contactgroup; contactsmember *temp_contactsmember; int odd = 0; - char *bg_class = ""; + const char *bg_class = ""; /* see if user is authorized to view contactgroup information... */ if(is_authorized_for_configuration_information(¤t_authdata) == FALSE) { @@ -1180,11 +1180,11 @@ contactgroupsmember *temp_contactgroupsmember = NULL; char *processed_string = NULL; char command_line[MAX_INPUT_BUFFER]; - char *command_name = ""; + char *command_name; int options; int odd = 0; char time_string[16]; - char *bg_class; + const char *bg_class; int contact = 0; @@ -1495,12 +1495,12 @@ daterange *temp_daterange = NULL; timeperiod *temp_timeperiod = NULL; timeperiodexclusion *temp_timeperiodexclusion = NULL; - char *months[12] = {"january", "february", "march", "april", "may", "june", "july", "august", "september", "october", "november", "december"}; - char *days[7] = {"sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"}; + const char *months[12] = {"january", "february", "march", "april", "may", "june", "july", "august", "september", "october", "november", "december"}; + const char *days[7] = {"sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"}; int odd = 0; int day = 0; int x = 0; - char *bg_class = ""; + const char *bg_class = ""; char timestring[10]; int hours = 0; int minutes = 0; @@ -1691,7 +1691,7 @@ void display_commands(void) { command *temp_command; int odd = 0; - char *bg_class = ""; + const char *bg_class = ""; /* see if user is authorized to view command information... */ if(is_authorized_for_configuration_information(¤t_authdata) == FALSE) { @@ -1735,7 +1735,7 @@ static void display_servicedependency(servicedependency *temp_sd) { - char *bg_class; + const char *bg_class; static int odd = 0; int options; @@ -1845,7 +1845,7 @@ char time_string[16] = ""; int options = FALSE; int odd = 0; - char *bg_class = ""; + const char *bg_class = ""; int contact = 0; unsigned int i; @@ -1975,7 +1975,7 @@ static void display_hostdependency(hostdependency *temp_hd) { int options; - char *bg_class = ""; + const char *bg_class = ""; static int odd = 0; if(*to_expand != '\0' && (strcmp(to_expand, temp_hd->dependent_host_name) && !strcmp(to_expand, temp_hd->host_name))) @@ -2069,7 +2069,7 @@ char time_string[16] = ""; int options = FALSE; int odd = 0; - char *bg_class = ""; + const char *bg_class = ""; int contact = 0; unsigned int i; @@ -2228,7 +2228,7 @@ void display_command_expansion(void) { command *temp_command; int odd = 0; - char *bg_class = ""; + const char *bg_class = ""; int i, j; char *c, *cc; char commandline[MAX_COMMAND_BUFFER]; Modified: nagioscore/trunk/cgi/extinfo.c =================================================================== --- nagioscore/trunk/cgi/extinfo.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/cgi/extinfo.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -934,7 +934,7 @@ char state_duration[48]; char status_age[48]; char state_string[MAX_INPUT_BUFFER]; - char *bg_class = ""; + const char *bg_class = ""; char *buf = NULL; int days; int hours; @@ -1243,7 +1243,7 @@ char state_duration[48]; servicestatus *temp_svcstatus; char state_string[MAX_INPUT_BUFFER]; - char *bg_class = ""; + const char *bg_class = ""; char *buf = NULL; int days; int hours; @@ -1773,7 +1773,7 @@ /* shows all service and host comments */ void show_all_comments(void) { int total_comments = 0; - char *bg_class = ""; + const char *bg_class = ""; int odd = 0; char date_time[MAX_DATETIME_LENGTH]; comment *temp_comment; @@ -2454,7 +2454,7 @@ service *temp_service = NULL; int total_comments = 0; int display_comment = FALSE; - char *bg_class = ""; + const char *bg_class = ""; int odd = 1; char date_time[MAX_DATETIME_LENGTH]; comment *temp_comment; @@ -2573,7 +2573,7 @@ /* shows all service and host scheduled downtime */ void show_all_downtime(void) { int total_downtime = 0; - char *bg_class = ""; + const char *bg_class = ""; int odd = 0; char date_time[MAX_DATETIME_LENGTH]; scheduled_downtime *temp_downtime; @@ -2737,7 +2737,7 @@ char date_time[MAX_DATETIME_LENGTH]; char temp_url[MAX_INPUT_BUFFER]; int odd = 0; - char *bgclass = ""; + const char *bgclass = ""; /* make sure the user has rights to view system information */ Modified: nagioscore/trunk/cgi/outages.c =================================================================== --- nagioscore/trunk/cgi/outages.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/cgi/outages.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -307,8 +307,8 @@ hostoutage *temp_hostoutage; hoststatus *temp_hoststatus; int odd = 0; - char *bg_class = ""; - char *status = ""; + const char *bg_class = ""; + const char *status = ""; int days; int hours; int minutes; Modified: nagioscore/trunk/cgi/status.c =================================================================== --- nagioscore/trunk/cgi/status.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/cgi/status.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -1294,10 +1294,10 @@ char temp_buffer[MAX_INPUT_BUFFER]; char temp_url[MAX_INPUT_BUFFER]; char *processed_string = NULL; - char *status_class = ""; - char *status_bg_class = ""; - char *host_status_bg_class = ""; - char *last_host = ""; + const char *status_class = ""; + const char *status_bg_class = ""; + const char *host_status_bg_class = ""; + const char *last_host = ""; int new_host = FALSE; servicestatus *temp_status = NULL; hostgroup *temp_hostgroup = NULL; @@ -1933,8 +1933,8 @@ char temp_buffer[MAX_INPUT_BUFFER]; char temp_url[MAX_INPUT_BUFFER]; char *processed_string = NULL; - char *status_class = ""; - char *status_bg_class = ""; + const char *status_class = ""; + const char *status_bg_class = ""; hoststatus *temp_status = NULL; hostgroup *temp_hostgroup = NULL; host *temp_host = NULL; @@ -2676,7 +2676,7 @@ /* displays status summary information for a specific servicegroup */ void show_servicegroup_summary(servicegroup *temp_servicegroup, int odd) { - char *status_bg_class = ""; + const char *status_bg_class = ""; if(odd == 1) status_bg_class = "Even"; @@ -3237,9 +3237,9 @@ /* displays status grid for a specific servicegroup */ void show_servicegroup_grid(servicegroup *temp_servicegroup) { - char *status_bg_class = ""; - char *host_status_class = ""; - char *service_status_class = ""; + const char *status_bg_class = ""; + const char *host_status_class = ""; + const char *service_status_class = ""; char *processed_string = NULL; servicesmember *temp_member; servicesmember *temp_member2; @@ -3618,8 +3618,8 @@ /* shows a host status overview... */ void show_servicegroup_hostgroup_member_overview(hoststatus *hststatus, int odd, void *data) { char status[MAX_INPUT_BUFFER]; - char *status_bg_class = ""; - char *status_class = ""; + const char *status_bg_class = ""; + const char *status_class = ""; host *temp_host = NULL; char *processed_string = NULL; @@ -3915,7 +3915,7 @@ /* displays status summary information for a specific hostgroup */ void show_hostgroup_summary(hostgroup *temp_hostgroup, int odd) { - char *status_bg_class = ""; + const char *status_bg_class = ""; if(odd == 1) status_bg_class = "Even"; @@ -4466,9 +4466,9 @@ /* displays status grid for a specific hostgroup */ void show_hostgroup_grid(hostgroup *temp_hostgroup) { hostsmember *temp_member; - char *status_bg_class = ""; - char *host_status_class = ""; - char *service_status_class = ""; + const char *status_bg_class = ""; + const char *host_status_class = ""; + const char *service_status_class = ""; host *temp_host; service *temp_service; hoststatus *temp_hoststatus; Modified: nagioscore/trunk/cgi/summary.c =================================================================== --- nagioscore/trunk/cgi/summary.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/cgi/summary.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -1724,9 +1724,9 @@ archived_event *temp_event; int current_item = 0; int odd = 0; - char *bgclass = ""; - char *status_bgclass = ""; - char *status = ""; + const char *bgclass = ""; + const char *status_bgclass = ""; + const char *status = ""; char date_time[MAX_DATETIME_LENGTH]; @@ -2684,7 +2684,7 @@ int producer_type = AE_HOST_PRODUCER; int current_item = 0; int odd = 0; - char *bgclass = ""; + const char *bgclass = ""; /* process all events */ for(temp_event = event_list; temp_event != NULL; temp_event = temp_event->next) { Modified: nagioscore/trunk/common/downtime.c =================================================================== --- nagioscore/trunk/common/downtime.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/common/downtime.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -238,7 +238,7 @@ scheduled_downtime *temp_downtime = NULL; host *hst = NULL; service *svc = NULL; - char *type_string = NULL; + const char *type_string = NULL; int hours = 0; int minutes = 0; int seconds = 0; Modified: nagioscore/trunk/common/objects.c =================================================================== --- nagioscore/trunk/common/objects.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/common/objects.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -76,7 +76,7 @@ struct flag_map { int opt; int ch; - char *name; + const char *name; }; struct flag_map service_flag_map[] = { @@ -269,7 +269,7 @@ /* read all host configuration data from external source */ -int read_object_config_data(char *main_config_file, int options) { +int read_object_config_data(const char *main_config_file, int options) { int result = OK; /* reset object counts */ Modified: nagioscore/trunk/common/shared.c =================================================================== --- nagioscore/trunk/common/shared.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/common/shared.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -69,7 +69,7 @@ } /* fix the problem with strtok() skipping empty options between tokens */ -char *my_strtok(char *buffer, char *tokens) { +char *my_strtok(char *buffer, const char *tokens) { char *token_position = NULL; char *sequence_head = NULL; static char *my_strtok_buffer = NULL; @@ -142,7 +142,7 @@ } /* open a file read-only via mmap() */ -mmapfile *mmap_fopen(char *filename) { +mmapfile *mmap_fopen(const char *filename) { mmapfile *new_mmapfile = NULL; int fd = 0; void *mmap_buf = NULL; @@ -461,12 +461,12 @@ int month; int day; int year; - char *weekdays[7] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; - char *months[12] = { + const char *weekdays[7] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; + const char *months[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec" }; - char *tzone = ""; + const char *tzone = ""; if(raw_time == NULL) time(&t); @@ -486,7 +486,7 @@ year = tm_ptr->tm_year + 1900; #ifdef HAVE_TM_ZONE - tzone = (char *)(tm_ptr->tm_zone); + tzone = tm_ptr->tm_zone; #else tzone = (tm_ptr->tm_isdst) ? tzname[1] : tzname[0]; #endif Modified: nagioscore/trunk/common/statusdata.c =================================================================== --- nagioscore/trunk/common/statusdata.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/common/statusdata.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -63,7 +63,7 @@ /******************************************************************/ /* initializes status data at program start */ -int initialize_status_data(char *cfgfile) { +int initialize_status_data(const char *cfgfile) { int result = OK; /**** IMPLEMENTATION-SPECIFIC CALLS ****/ Modified: nagioscore/trunk/include/cgiutils.h =================================================================== --- nagioscore/trunk/include/cgiutils.h 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/include/cgiutils.h 2013-04-07 15:44:11 UTC (rev 2731) @@ -425,13 +425,13 @@ void reset_cgi_vars(void); void free_memory(void); -char *get_cgi_config_location(void); /* gets location of the CGI config file to read */ -char *get_cmd_file_location(void); /* gets location of external command file to write to */ +const char *get_cgi_config_location(void); /* gets location of the CGI config file to read */ +const char *get_cmd_file_location(void); /* gets location of external command file to write to */ -int read_cgi_config_file(char *); -int read_main_config_file(char *); -int read_all_object_configuration_data(char *, int); -int read_all_status_data(char *, int); +int read_cgi_config_file(const char *); +int read_main_config_file(const char *); +int read_all_object_configuration_data(const char *, int); +int read_all_status_data(const char *, int); char *unescape_newlines(char *); void sanitize_plugin_output(char *); /* strips HTML and bad characters from plugin output */ @@ -440,9 +440,9 @@ void get_time_string(time_t *, char *, int, int); /* gets a date/time string */ void get_interval_time_string(double, char *, int); /* gets a time string for an interval of time */ -char *url_encode(char *); /* encodes a string in proper URL format */ +const char *url_encode(const char *); /* encodes a string in proper URL format */ char *html_encode(char *, int); /* encodes a string in HTML format (for what the user sees) */ -char *escape_string(char *); /* escape string for html form usage */ +char *escape_string(const char *); /* escape string for html form usage */ void get_log_archive_to_use(int, char *, int); /* determines the name of the log archive to use */ void determine_log_rotation_times(int); @@ -451,7 +451,7 @@ void print_extra_hostgroup_url(char *, char *); void print_extra_servicegroup_url(char *, char *); -void display_info_table(char *, int, authdata *); +void display_info_table(const char *, int, authdata *); void display_nav_table(char *, int); void display_splunk_host_url(host *); @@ -459,15 +459,15 @@ void display_splunk_generic_url(char *, int); void strip_splunk_query_terms(char *); -void include_ssi_files(char *, int); /* include user-defined SSI footers/headers */ -void include_ssi_file(char *); /* include user-defined SSI footer/header */ +void include_ssi_files(const char *, int); /* include user-defined SSI footers/headers */ +void include_ssi_file(const char *); /* include user-defined SSI footer/header */ -void cgi_config_file_error(char *); -void main_config_file_error(char *); +void cgi_config_file_error(const char *); +void main_config_file_error(const char *); void object_data_error(void); void status_data_error(void); -void display_context_help(char *); /* displays context-sensitive help window */ +void display_context_help(const char *); /* displays context-sensitive help window */ int read_file_into_lifo(char *); /* LIFO functions */ void free_lifo_memory(void); Modified: nagioscore/trunk/include/nagios.h =================================================================== --- nagioscore/trunk/include/nagios.h 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/include/nagios.h 2013-04-07 15:44:11 UTC (rev 2731) @@ -609,7 +609,7 @@ time_t get_next_log_rotation_time(void); /* determine the next time to schedule a log rotation */ int dbuf_init(dbuf *, int); int dbuf_free(dbuf *); -int dbuf_strcat(dbuf *, char *); +int dbuf_strcat(dbuf *, const char *); int set_environment_var(char *, char *, int); /* sets/clears and environment variable */ int check_for_nagios_updates(int, int); /* checks to see if new version of Nagios are available */ int query_update_api(void); /* checks to see if new version of Nagios are available */ Modified: nagioscore/trunk/include/netutils.h =================================================================== --- nagioscore/trunk/include/netutils.h 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/include/netutils.h 2013-04-07 15:44:11 UTC (rev 2731) @@ -2,8 +2,8 @@ #define _NETUTILS_H #include "common.h" NAGIOS_BEGIN_DECL -int my_tcp_connect(char *host_name, int port, int *sd, int timeout); -int my_sendall(int s, char *buf, int *len, int timeout); +int my_tcp_connect(const char *host_name, int port, int *sd, int timeout); +int my_sendall(int s, const char *buf, int *len, int timeout); int my_recvall(int s, char *buf, int *len, int timeout); NAGIOS_END_DECL #endif Modified: nagioscore/trunk/include/objects.h =================================================================== --- nagioscore/trunk/include/objects.h 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/include/objects.h 2013-04-07 15:44:11 UTC (rev 2731) @@ -734,7 +734,7 @@ /********************* FUNCTIONS **********************/ /**** Top-level input functions ****/ -int read_object_config_data(char *, int); /* reads all external configuration data of specific types */ +int read_object_config_data(const char *, int); /* reads all external configuration data of specific types */ /**** Object Creation Functions ****/ Modified: nagioscore/trunk/include/perfdata.h =================================================================== --- nagioscore/trunk/include/perfdata.h 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/include/perfdata.h 2013-04-07 15:44:11 UTC (rev 2731) @@ -28,11 +28,11 @@ NAGIOS_BEGIN_DECL -int initialize_performance_data(char *); /* initializes performance data */ -int cleanup_performance_data(void); /* cleans up performance data */ +int initialize_performance_data(const char *); /* initializes performance data */ +int cleanup_performance_data(void); /* cleans up performance data */ -int update_host_performance_data(host *); /* updates host performance data */ -int update_service_performance_data(service *); /* updates service performance data */ +int update_host_performance_data(host *); /* updates host performance data */ +int update_service_performance_data(service *); /* updates service performance data */ NAGIOS_END_DECL #endif Modified: nagioscore/trunk/include/shared.h =================================================================== --- nagioscore/trunk/include/shared.h 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/include/shared.h 2013-04-07 15:44:11 UTC (rev 2731) @@ -36,9 +36,9 @@ extern struct object_count num_objects; extern void timing_point(const char *fmt, ...); /* print a message and the time since the first message */ -extern char *my_strtok(char *buffer, char *tokens); +extern char *my_strtok(char *buffer, const char *tokens); extern char *my_strsep(char **stringp, const char *delim); -extern mmapfile *mmap_fopen(char *filename); +extern mmapfile *mmap_fopen(const char *filename); extern int mmap_fclose(mmapfile *temp_mmapfile); extern char *mmap_fgets(mmapfile *temp_mmapfile); extern char *mmap_fgets_multiline(mmapfile * temp_mmapfile); Modified: nagioscore/trunk/include/sretention.h =================================================================== --- nagioscore/trunk/include/sretention.h 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/include/sretention.h 2013-04-07 15:44:11 UTC (rev 2731) @@ -23,7 +23,7 @@ #include "common.h" NAGIOS_BEGIN_DECL -int initialize_retention_data(char *); +int initialize_retention_data(const char *); int cleanup_retention_data(void); int save_state_information(int); /* saves all host and state information */ int read_initial_state_information(void); /* reads in initial host and state information */ Modified: nagioscore/trunk/include/statusdata.h =================================================================== --- nagioscore/trunk/include/statusdata.h 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/include/statusdata.h 2013-04-07 15:44:11 UTC (rev 2731) @@ -171,7 +171,7 @@ /**************************** FUNCTIONS ******************************/ -int read_status_data(char *, int); /* reads all status data */ +int read_status_data(const char *, int); /* reads all status data */ int add_host_status(hoststatus *); /* adds a host status entry to the list in memory */ int add_service_status(servicestatus *); /* adds a service status entry to the list in memory */ @@ -186,7 +186,7 @@ #endif #ifndef NSCGI -int initialize_status_data(char *); /* initializes status data at program start */ +int initialize_status_data(const char *); /* initializes status data at program start */ int update_all_status_data(void); /* updates all status data */ int cleanup_status_data(int); /* cleans up status data at program termination */ int update_program_status(int); /* updates program status data */ Modified: nagioscore/trunk/lib/iobroker.c =================================================================== --- nagioscore/trunk/lib/iobroker.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/lib/iobroker.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -65,7 +65,7 @@ static struct { int code; - char *string; + const char *string; } iobroker_errors[] = { { IOBROKER_SUCCESS, "Success" }, { IOBROKER_ENOSET, "IOB set is NULL" }, Modified: nagioscore/trunk/lib/kvvec.c =================================================================== --- nagioscore/trunk/lib/kvvec.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/lib/kvvec.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -67,7 +67,7 @@ return kvvec_resize(kvv, kvv->kv_alloc + hint); } -int kvvec_addkv_wlen(struct kvvec *kvv, char *key, int keylen, char *value, int valuelen) +int kvvec_addkv_wlen(struct kvvec *kvv, const char *key, int keylen, const char *value, int valuelen) { struct key_value *kv; @@ -80,9 +80,9 @@ } kv = &kvv->kv[kvv->kv_pairs++]; - kv->key = key; + kv->key = (char *)key; kv->key_len = keylen; - kv->value = value; + kv->value = (char *)value; kv->value_len = valuelen; if (!keylen) { @@ -308,7 +308,7 @@ if (flags & KVVEC_COPY) { kv->value = strdup(""); } else { - kv->value = ""; + kv->value = (char *)""; } } else { kv->value_len = (unsigned long)kv_end_ptr - ((unsigned long)str + offset); Modified: nagioscore/trunk/lib/kvvec.h =================================================================== --- nagioscore/trunk/lib/kvvec.h 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/lib/kvvec.h 2013-04-07 15:44:11 UTC (rev 2731) @@ -115,7 +115,7 @@ * @param valuelen Length of the value * @return 0 on success, < 0 on errors */ -extern int kvvec_addkv_wlen(struct kvvec *kvv, char *key, int keylen, char *value, int valuelen); +extern int kvvec_addkv_wlen(struct kvvec *kvv, const char *key, int keylen, const char *value, int valuelen); /** * Shortcut to kvvec_addkv_wlen() when lengths aren't known Modified: nagioscore/trunk/lib/worker.c =================================================================== --- nagioscore/trunk/lib/worker.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/lib/worker.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -72,7 +72,7 @@ va_start(ap, fmt); len = vsnprintf(&lmsg[len], sizeof(lmsg) - 7, fmt, ap); va_end(ap); - if (len < 0 || len >= sizeof(lmsg)) + if (len < 0 || len >= (int)sizeof(lmsg)) return; len += 4; /* log= */ @@ -100,7 +100,7 @@ len = vsnprintf(msg, sizeof(msg) - 1, fmt, ap); va_end(ap); if (cp) { - kvvec_addkv(kvv, "job_id", (char *)mkstr("%d", cp->id)); + kvvec_addkv(kvv, "job_id", mkstr("%d", cp->id)); } kvvec_addkv_wlen(kvv, "error_msg", 9, msg, len); ret = worker_send_kvvec(master_sd, kvv); @@ -160,13 +160,13 @@ #define kvvec_add_long(kvv, key, value) \ do { \ - char *buf = (char *)mkstr("%ld", value); \ + const char *buf = mkstr("%ld", value); \ kvvec_addkv_wlen(kvv, key, sizeof(key) - 1, buf, strlen(buf)); \ } while (0) #define kvvec_add_tv(kvv, key, value) \ do { \ - char *buf = (char *)mkstr("%ld.%06ld", value.tv_sec, value.tv_usec); \ + const char *buf = mkstr("%ld.%06ld", value.tv_sec, value.tv_usec); \ kvvec_addkv_wlen(kvv, key, sizeof(key) - 1, buf, strlen(buf)); \ } while (0) @@ -226,12 +226,12 @@ } kvvec_addkv_wlen(&resp, kv->key, kv->key_len, kv->value, kv->value_len); } - kvvec_addkv(&resp, "wait_status", (char *)mkstr("%d", cp->ret)); + kvvec_addkv(&resp, "wait_status", mkstr("%d", cp->ret)); kvvec_addkv_wlen(&resp, "outstd", 6, cp->outstd.buf, cp->outstd.len); kvvec_addkv_wlen(&resp, "outerr", 6, cp->outerr.buf, cp->outerr.len); kvvec_add_tv(&resp, "start", cp->ei->start); kvvec_add_tv(&resp, "stop", cp->ei->stop); - kvvec_addkv(&resp, "runtime", (char *)mkstr("%f", cp->ei->runtime)); + kvvec_addkv(&resp, "runtime", mkstr("%f", cp->ei->runtime)); if (!reason) { /* child exited nicely */ kvvec_addkv(&resp, "exited_ok", "1"); @@ -244,7 +244,7 @@ } else { /* some error happened */ kvvec_addkv(&resp, "exited_ok", "0"); - kvvec_addkv(&resp, "error_code", (char *)mkstr("%d", reason)); + kvvec_addkv(&resp, "error_code", mkstr("%d", reason)); } ret = worker_send_kvvec(master_sd, &resp); if (ret < 0 && errno == EPIPE) Modified: nagioscore/trunk/xdata/xodtemplate.c =================================================================== --- nagioscore/trunk/xdata/xodtemplate.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/xdata/xodtemplate.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -184,7 +184,7 @@ #endif /* process all config files - both core and CGIs pass in name of main config file */ -int xodtemplate_read_config_data(char *main_config_file, int options) { +int xodtemplate_read_config_data(const char *main_config_file, int options) { #ifdef NSCORE char *cfgfile = NULL; char *config_base_dir = NULL; @@ -1053,7 +1053,7 @@ #undef xod_begin_def /* we don't need this anymore */ static const char *xodtemplate_type_name(unsigned int id) { - static char *otype_name[] = { + static const char *otype_name[] = { "NONE", "timeperiod", "commmand", "contact", "contactgroup", "host", "hostgroup", "service", "servicedependency", "serviceescalation", "hostescalation", "hostdependency", @@ -3858,7 +3858,7 @@ int xodtemplate_get_month_from_string(char *str, int *month) { - char *months[12] = {"january", "february", "march", "april", "may", "june", "july", "august", "september", "october", "november", "december"}; + const char *months[12] = {"january", "february", "march", "april", "may", "june", "july", "august", "september", "october", "november", "december"}; int x = 0; if(str == NULL || month == NULL) @@ -3878,7 +3878,7 @@ int xodtemplate_get_weekday_from_string(char *str, int *weekday) { - char *days[7] = {"sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"}; + const char *days[7] = {"sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"}; int x = 0; if(str == NULL || weekday == NULL) Modified: nagioscore/trunk/xdata/xodtemplate.h =================================================================== --- nagioscore/trunk/xdata/xodtemplate.h 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/xdata/xodtemplate.h 2013-04-07 15:44:11 UTC (rev 2731) @@ -743,7 +743,7 @@ /********* FUNCTION DEFINITIONS **********/ -int xodtemplate_read_config_data(char *, int); /* top-level routine processes all config files */ +int xodtemplate_read_config_data(const char *, int); /* top-level routine processes all config files */ int xodtemplate_grab_config_info(char *); /* grabs variables from main config file */ int xodtemplate_process_config_file(char *, int); /* process data in a specific config file */ int xodtemplate_process_config_dir(char *, int); /* process all files in a specific config directory */ Modified: nagioscore/trunk/xdata/xpddefault.c =================================================================== --- nagioscore/trunk/xdata/xpddefault.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/xdata/xpddefault.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -75,7 +75,7 @@ /******************************************************************/ /* grabs configuration information from main config file */ -int xpddefault_grab_config_info(char *cfgfile) { +int xpddefault_grab_config_info(const char *cfgfile) { char *input = NULL; mmapfile *thefile = NULL; @@ -207,7 +207,7 @@ /******************************************************************/ /* initializes performance data */ -int xpddefault_initialize_performance_data(char *cfgfile) { +int xpddefault_initialize_performance_data(const char *cfgfile) { char *buffer = NULL; char *temp_buffer = NULL; char *temp_command_name = NULL; Modified: nagioscore/trunk/xdata/xpddefault.h =================================================================== --- nagioscore/trunk/xdata/xpddefault.h 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/xdata/xpddefault.h 2013-04-07 15:44:11 UTC (rev 2731) @@ -33,9 +33,9 @@ #define DEFAULT_SERVICE_PERFDATA_PROCESS_EMPTY_RESULTS 1 -int xpddefault_initialize_performance_data(char *); -int xpddefault_grab_config_info(char *); +int xpddefault_initialize_performance_data(const char *); int xpddefault_cleanup_performance_data(void); +int xpddefault_grab_config_info(const char *); int xpddefault_grab_config_directives(char *); int xpddefault_update_service_performance_data(service *); Modified: nagioscore/trunk/xdata/xrddefault.c =================================================================== --- nagioscore/trunk/xdata/xrddefault.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/xdata/xrddefault.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -48,7 +48,7 @@ /********************* CONFIG INITIALIZATION *********************/ /******************************************************************/ -int xrddefault_grab_config_info(char *main_config_file) { +int xrddefault_grab_config_info(const char *main_config_file) { char *input = NULL; mmapfile *thefile = NULL; nagios_macros *mac; @@ -151,7 +151,7 @@ /* initialize retention data */ -int xrddefault_initialize_retention_data(char *cfgfile) { +int xrddefault_initialize_retention_data(const char *cfgfile) { int result; /* grab configuration data */ Modified: nagioscore/trunk/xdata/xrddefault.h =================================================================== --- nagioscore/trunk/xdata/xrddefault.h 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/xdata/xrddefault.h 2013-04-07 15:44:11 UTC (rev 2731) @@ -35,9 +35,9 @@ #define XRDDEFAULT_HOSTDOWNTIME_DATA 8 #define XRDDEFAULT_SERVICEDOWNTIME_DATA 9 -int xrddefault_initialize_retention_data(char *); -int xrddefault_grab_config_info(char *); +int xrddefault_initialize_retention_data(const char *); int xrddefault_cleanup_retention_data(void); +int xrddefault_grab_config_info(const char *); int xrddefault_grab_config_directives(char *); int xrddefault_save_state_information(void); /* saves all host and service state information */ int xrddefault_read_state_information(void); /* reads in initial host and service state information */ Modified: nagioscore/trunk/xdata/xsddefault.c =================================================================== --- nagioscore/trunk/xdata/xsddefault.c 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/xdata/xsddefault.c 2013-04-07 15:44:11 UTC (rev 2731) @@ -76,7 +76,7 @@ /******************************************************************/ /* grab configuration information */ -int xsddefault_grab_config_info(char *cfgfile) { +int xsddefault_grab_config_info(const char *cfgfile) { char *input = NULL; mmapfile *thefile; #ifdef NSCGI @@ -221,7 +221,7 @@ /* initialize status data */ -int xsddefault_initialize_status_data(char *cfgfile) { +int xsddefault_initialize_status_data(const char *cfgfile) { int result; /* use the global already-parsed temp_file for this */ Modified: nagioscore/trunk/xdata/xsddefault.h =================================================================== --- nagioscore/trunk/xdata/xsddefault.h 2013-04-07 15:42:52 UTC (rev 2730) +++ nagioscore/trunk/xdata/xsddefault.h 2013-04-07 15:44:11 UTC (rev 2731) @@ -24,7 +24,7 @@ #define _XSDDEFAULT_H #ifdef NSCORE -int xsddefault_initialize_status_data(char *); +int xsddefault_initialize_status_data(const char *); int xsddefault_cleanup_status_data(int); int xsddefault_save_status_data(void); #endif @@ -42,10 +42,10 @@ #define XSDDEFAULT_HOSTDOWNTIME_DATA 8 #define XSDDEFAULT_SERVICEDOWNTIME_DATA 9 -int xsddefault_read_status_data(char *, int); +int xsddefault_read_status_data(const char *, int); #endif -int xsddefault_grab_config_info(char *); +int xsddefault_grab_config_info(const char *); int xsddefault_grab_config_directives(char *); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |