diff options
| -rw-r--r-- | lib/tests/test_utils.c | 18 | ||||
| -rw-r--r-- | lib/utils_base.c | 5 |
2 files changed, 9 insertions, 14 deletions
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c index 53369077..d4a08005 100644 --- a/lib/tests/test_utils.c +++ b/lib/tests/test_utils.c @@ -37,8 +37,6 @@ main (int argc, char **argv) state_key *temp_state_key = NULL; state_data *temp_state_data; time_t current_time; - char *temp_filename; - FILE *temp_fp; plan_tests(141); @@ -342,7 +340,7 @@ main (int argc, char **argv) ok( !strcmp(temp_state_key->_filename, "/usr/local/nagios/var/check_test/funnykeyname"), "Got internal filename" ); ok( temp_state_key->data_version==54, "Version set" ); - temp_state_data = np_state_read(temp_state_key); + temp_state_data = np_state_read(); ok( temp_state_data==NULL, "Got no state data as file does not exist" ); @@ -356,31 +354,31 @@ main (int argc, char **argv) */ temp_state_key->_filename="var/statefile"; - temp_state_data = np_state_read(temp_state_key); + temp_state_data = np_state_read(); ok( this_nagios_plugin->state->state_data!=NULL, "Got state data now" ) || diag("Are you running in right directory? Will get coredump next if not"); ok( this_nagios_plugin->state->state_data->time==1234567890, "Got time" ); ok( !strcmp((char *)this_nagios_plugin->state->state_data->data, "String to read"), "Data as expected" ); temp_state_key->data_version=53; - temp_state_data = np_state_read(temp_state_key); + temp_state_data = np_state_read(); ok( temp_state_data==NULL, "Older data version gives NULL" ); temp_state_key->data_version=54; temp_state_key->_filename="var/nonexistant"; - temp_state_data = np_state_read(temp_state_key); + temp_state_data = np_state_read(); ok( temp_state_data==NULL, "Missing file gives NULL" ); ok( this_nagios_plugin->state->state_data==NULL, "No state information" ); temp_state_key->_filename="var/oldformat"; - temp_state_data = np_state_read(temp_state_key); + temp_state_data = np_state_read(); ok( temp_state_data==NULL, "Old file format gives NULL" ); temp_state_key->_filename="var/baddate"; - temp_state_data = np_state_read(temp_state_key); + temp_state_data = np_state_read(); ok( temp_state_data==NULL, "Bad date gives NULL" ); temp_state_key->_filename="var/missingdataline"; - temp_state_data = np_state_read(temp_state_key); + temp_state_data = np_state_read(); ok( temp_state_data==NULL, "Missing data line gives NULL" ); @@ -413,7 +411,7 @@ main (int argc, char **argv) temp_state_key->_filename="var/generated"; time(¤t_time); np_state_write_string(0, "String to read"); - temp_state_data = np_state_read(temp_state_key); + temp_state_data = np_state_read(); /* Check time is set to current_time */ ok(system("cmp var/generated var/statefile > /dev/null")!=0, "Generated file should be different this time"); ok(this_nagios_plugin->state->state_data->time-current_time<=1, "Has time generated from current time"); diff --git a/lib/utils_base.c b/lib/utils_base.c index 6de92cbd..1f705d97 100644 --- a/lib/utils_base.c +++ b/lib/utils_base.c @@ -471,10 +471,8 @@ void np_enable_state(char *keyname, int expected_data_version) { * if exceptional error. */ state_data *np_state_read() { - state_key *my_state_key; state_data *this_state_data=NULL; FILE *statefile; - int c; int rc = FALSE; if(this_nagios_plugin==NULL) @@ -508,7 +506,7 @@ state_data *np_state_read() { * Read the state file */ int _np_state_read_file(FILE *f) { - int c, status=FALSE; + int status=FALSE; size_t pos; char *line; int i; @@ -585,7 +583,6 @@ void np_state_write_string(time_t data_time, char *data_string) { char *temp_file=NULL; int fd=0, result=0; time_t current_time; - size_t len; char *directories=NULL; char *p=NULL; |