From 4b9d90f31c700298185aa4c7b20fe1c5e8bf19c2 Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Sun, 15 Oct 2023 18:17:36 +0200
Subject: Whitespace fixes in lib

---
 lib/extra_opts.c        | 12 ++++++------
 lib/parse_ini.c         | 14 +++++++-------
 lib/tests/test_base64.c | 10 +++++-----
 lib/tests/test_cmd.c    | 10 +++++-----
 lib/tests/test_disk.c   | 18 +++++++++---------
 lib/tests/test_ini1.c   | 10 +++++-----
 lib/tests/test_ini3.c   | 10 +++++-----
 lib/tests/test_opts2.c  |  2 +-
 lib/tests/test_tcp.c    | 14 +++++++-------
 lib/tests/test_utils.c  | 21 ++++++++++-----------
 lib/utils_base.c        | 24 ++++++++++++------------
 lib/utils_base.h        |  4 ++--
 lib/utils_cmd.c         | 12 ++++++------
 lib/utils_cmd.h         |  6 +++---
 lib/utils_disk.c        | 23 +++++++++++------------
 lib/utils_tcp.c         | 20 ++++++++++----------
 16 files changed, 104 insertions(+), 106 deletions(-)

diff --git a/lib/extra_opts.c b/lib/extra_opts.c
index f4d5e66a..89b10560 100644
--- a/lib/extra_opts.c
+++ b/lib/extra_opts.c
@@ -1,23 +1,23 @@
 /*****************************************************************************
-* 
+*
 * Monitoring Plugins extra_opts library
-* 
+*
 * License: GPL
 * Copyright (c) 2007 Monitoring Plugins Development Team
-* 
+*
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
+*
 *****************************************************************************/
 
 #include "common.h"
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index 547af433..57e60942 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -1,24 +1,24 @@
 /*****************************************************************************
-* 
+*
 * Monitoring Plugins parse_ini library
-* 
+*
 * License: GPL
 * Copyright (c) 2007 Monitoring Plugins Development Team
-* 
+*
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
+*
+*
 *****************************************************************************/
 
 #include "common.h"
diff --git a/lib/tests/test_base64.c b/lib/tests/test_base64.c
index 5103d10d..05dd7943 100644
--- a/lib/tests/test_base64.c
+++ b/lib/tests/test_base64.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-* 
+*
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
+*
+*
 *****************************************************************************/
 
 #include "common.h"
diff --git a/lib/tests/test_cmd.c b/lib/tests/test_cmd.c
index 4bb60aac..02ae11f5 100644
--- a/lib/tests/test_cmd.c
+++ b/lib/tests/test_cmd.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-* 
+*
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
+*
+*
 *****************************************************************************/
 
 #include "common.h"
diff --git a/lib/tests/test_disk.c b/lib/tests/test_disk.c
index 9bd68c7a..269d20b6 100644
--- a/lib/tests/test_disk.c
+++ b/lib/tests/test_disk.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-* 
+*
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
+*
+*
 *****************************************************************************/
 
 #include "common.h"
@@ -167,7 +167,7 @@ main (int argc, char **argv)
 	}
 	ok(found == 0, "first element successfully deleted");
 	found = 0;
-	
+
 	p=paths;
 	while (p) {
 		if (! strcmp(p->name, "/tmp"))
@@ -203,9 +203,9 @@ main (int argc, char **argv)
 }
 
 
-void 
+void
 np_test_mount_entry_regex (struct mount_entry *dummy_mount_list, char *regstr, int cflags, int expect, char *desc)
-{	
+{
 	int matches = 0;
 	regex_t re;
 	struct mount_entry *me;
@@ -214,7 +214,7 @@ np_test_mount_entry_regex (struct mount_entry *dummy_mount_list, char *regstr, i
 			if(np_regex_match_mount_entry(me,&re))
 				matches++;
 		}
-		ok( matches == expect, 
+		ok( matches == expect,
 	    	    "%s '%s' matched %i/3 entries. ok: %i/3",
 		    desc, regstr, expect, matches);
 
diff --git a/lib/tests/test_ini1.c b/lib/tests/test_ini1.c
index 77f88549..6843bac2 100644
--- a/lib/tests/test_ini1.c
+++ b/lib/tests/test_ini1.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-* 
+*
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
+*
+*
 *****************************************************************************/
 
 #include "common.h"
diff --git a/lib/tests/test_ini3.c b/lib/tests/test_ini3.c
index 814b3ec0..8a2a0414 100644
--- a/lib/tests/test_ini3.c
+++ b/lib/tests/test_ini3.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-* 
+*
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
+*
+*
 *****************************************************************************/
 
 #include "parse_ini.h"
diff --git a/lib/tests/test_opts2.c b/lib/tests/test_opts2.c
index c3d2067f..780220ee 100644
--- a/lib/tests/test_opts2.c
+++ b/lib/tests/test_opts2.c
@@ -12,7 +12,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
+*
 *****************************************************************************/
 
 #include "common.h"
diff --git a/lib/tests/test_tcp.c b/lib/tests/test_tcp.c
index 114252b4..1954b0fb 100644
--- a/lib/tests/test_tcp.c
+++ b/lib/tests/test_tcp.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-* 
+*
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
+*
+*
 *****************************************************************************/
 
 #include "common.h"
@@ -33,7 +33,7 @@ main(void)
 	server_expect[0] = strdup("AA");
 	server_expect[1] = strdup("bb");
 	server_expect[2] = strdup("CC");
-	
+
 	ok(np_expect_match("AA bb CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) == NP_MATCH_SUCCESS,
 	   "Test matching any string at the beginning (first expect string)");
 	ok(np_expect_match("bb AA CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) == NP_MATCH_SUCCESS,
@@ -52,7 +52,7 @@ main(void)
 	   "Test not matching all strings");
 	ok(np_expect_match("XX XX", server_expect, server_expect_count, NP_MATCH_ALL) == NP_MATCH_RETRY,
 	   "Test not matching any string (testing all)");
-	 
+
 
 	return exit_status();
 }
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index 7b10494c..a109e3f4 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-* 
+*
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
+*
+*
 *****************************************************************************/
 
 #include "common.h"
@@ -377,13 +377,13 @@ main (int argc, char **argv)
 
 /*
 	temp_fp = fopen("var/statefile", "r");
-	if (temp_fp==NULL) 
+	if (temp_fp==NULL)
 		printf("Error opening. errno=%d\n", errno);
 	printf("temp_fp=%s\n", temp_fp);
-	ok( _np_state_read_file(temp_fp) == TRUE, "Can read state file" );
+	ok( _np_state_read_file(temp_fp) == true, "Can read state file" );
 	fclose(temp_fp);
 */
-	
+
 	temp_state_key->_filename="var/statefile";
 	temp_state_data = np_state_read();
 	ok( this_monitoring_plugin->state->state_data!=NULL, "Got state data now" ) || diag("Are you running in right directory? Will get coredump next if not");
@@ -446,14 +446,14 @@ main (int argc, char **argv)
 	/* 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_monitoring_plugin->state->state_data->time-current_time<=1, "Has time generated from current time");
-	
+
 
 	/* Don't know how to automatically test this. Need to be able to redefine die and catch the error */
 	/*
 	temp_state_key->_filename="/dev/do/not/expect/to/be/able/to/write";
 	np_state_write_string(0, "Bad file");
 	*/
-	
+
 
 	np_cleanup();
 
@@ -508,4 +508,3 @@ main (int argc, char **argv)
 
 	return exit_status();
 }
-
diff --git a/lib/utils_base.c b/lib/utils_base.c
index 0f521263..eabcd7ee 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -6,21 +6,21 @@
 * Copyright (c) 2006 Monitoring Plugins Development Team
 *
 * Library of useful functions for plugins
-* 
+*
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
+*
 *
 *****************************************************************************/
 
@@ -640,10 +640,10 @@ int _np_state_read_file(FILE *f) {
 }
 
 /*
- * If time=NULL, use current time. Create state file, with state format 
- * version, default text. Writes version, time, and data. Avoid locking 
- * problems - use mv to write and then swap. Possible loss of state data if 
- * two things writing to same key at same time. 
+ * If time=NULL, use current time. Create state file, with state format
+ * version, default text. Writes version, time, and data. Avoid locking
+ * problems - use mv to write and then swap. Possible loss of state data if
+ * two things writing to same key at same time.
  * Will die with UNKNOWN if errors
  */
 void np_state_write_string(time_t data_time, char *data_string) {
@@ -658,7 +658,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
 		time(&current_time);
 	else
 		current_time=data_time;
-	
+
 	/* If file doesn't currently exist, create directories */
 	if(access(this_monitoring_plugin->state->_filename,F_OK)!=0) {
 		result = asprintf(&directories, "%s", this_monitoring_plugin->state->_filename);
@@ -697,15 +697,15 @@ void np_state_write_string(time_t data_time, char *data_string) {
 		np_free(temp_file);
 		die(STATE_UNKNOWN, _("Unable to open temporary state file"));
 	}
-	
+
 	fprintf(fp,"# NP State file\n");
 	fprintf(fp,"%d\n",NP_STATE_FORMAT_VERSION);
 	fprintf(fp,"%d\n",this_monitoring_plugin->state->data_version);
 	fprintf(fp,"%lu\n",current_time);
 	fprintf(fp,"%s\n",data_string);
-	
+
 	fchmod(fd, S_IRUSR | S_IWUSR | S_IRGRP);
-	
+
 	fflush(fp);
 
 	result=fclose(fp);
diff --git a/lib/utils_base.h b/lib/utils_base.h
index 9cb42767..9abf5957 100644
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -6,7 +6,7 @@
 # include "sha256.h"
 #endif
 
-/* This file holds header information for thresholds - use this in preference to 
+/* This file holds header information for thresholds - use this in preference to
    individual plugin logic */
 
 /* This has not been merged with utils.h because of problems with
@@ -79,7 +79,7 @@ void die (int, const char *, ...) __attribute__((noreturn,format(printf, 2, 3)))
 #define NP_RANGE_UNPARSEABLE 1
 #define NP_WARN_WITHIN_CRIT 2
 
-/* a simple check to see if we're running as root.  
+/* a simple check to see if we're running as root.
  * returns zero on failure, nonzero on success */
 int np_check_if_root(void);
 
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index f66fd573..cfb2073c 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -18,18 +18,18 @@
 * Care has been taken to make sure the functions are async-safe. The one
 * function which isn't is cmd_init() which it doesn't make sense to
 * call twice anyway, so the api as a whole should be considered async-safe.
-* 
-* 
+*
+*
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
@@ -377,10 +377,10 @@ cmd_file_read ( char *filename, output *out, int flags)
 	if ((fd = open(filename, O_RDONLY)) == -1) {
 		die( STATE_UNKNOWN, _("Error opening %s: %s"), filename, strerror(errno) );
 	}
-	
+
 	if(out)
 		out->lines = _cmd_fetch_output (fd, out, flags);
-	
+
 	if (close(fd) == -1)
 		die( STATE_UNKNOWN, _("Error closing %s: %s"), filename, strerror(errno) );
 
diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h
index f1b06c82..061f5d4f 100644
--- a/lib/utils_cmd.h
+++ b/lib/utils_cmd.h
@@ -1,10 +1,10 @@
 #ifndef _UTILS_CMD_
 #define _UTILS_CMD_
 
-/* 
+/*
  * Header file for Monitoring Plugins utils_cmd.c
- * 
- * 
+ *
+ *
  */
 
 /** types **/
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
index f5ac0b30..5e95aef6 100644
--- a/lib/utils_disk.c
+++ b/lib/utils_disk.c
@@ -1,29 +1,29 @@
 /*****************************************************************************
-* 
+*
 * Library for check_disk
-* 
+*
 * License: GPL
 * Copyright (c) 1999-2007 Monitoring Plugins Development Team
-* 
+*
 * Description:
-* 
+*
 * This file contains utilities for check_disk. These are tested by libtap
-* 
-* 
+*
+*
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
+*
+*
 *****************************************************************************/
 
 #include "common.h"
@@ -98,7 +98,7 @@ np_add_parameter(struct parameter_list **list, const char *name)
   new_path->freeinodes_percent = NULL;
   new_path->group = NULL;
   new_path->dfree_pct = -1;
-  new_path->dused_pct = -1; 
+  new_path->dused_pct = -1;
   new_path->total = 0;
   new_path->available = 0;
   new_path->available_to_root = 0;
@@ -279,4 +279,3 @@ np_regex_match_mount_entry (struct mount_entry* me, regex_t* re)
     return FALSE;
   }
 }
-
diff --git a/lib/utils_tcp.c b/lib/utils_tcp.c
index b37c446f..23ee4a95 100644
--- a/lib/utils_tcp.c
+++ b/lib/utils_tcp.c
@@ -1,29 +1,29 @@
 /*****************************************************************************
-* 
+*
 * Library for check_tcp
-* 
+*
 * License: GPL
 * Copyright (c) 1999-2013 Monitoring Plugins Development Team
-* 
+*
 * Description:
-* 
+*
 * This file contains utilities for check_tcp. These are tested by libtap
-* 
-* 
+*
+*
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
+*
+*
 *****************************************************************************/
 
 #include "common.h"
-- 
cgit v1.2.3-74-g34f1


From ddbabaa3b659bed9dcf5c5a2bfc430fb816277c7 Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Sun, 15 Oct 2023 18:21:31 +0200
Subject: Replace all old school booleans in lib witch C99 ones

---
 lib/extra_opts.c       |  9 +++---
 lib/parse_ini.c        |  7 +++--
 lib/tests/test_disk.c  | 20 ++++++-------
 lib/tests/test_utils.c | 76 +++++++++++++++++++++++++-------------------------
 lib/utils_base.c       | 51 +++++++++++++++++----------------
 lib/utils_base.h       |  4 +--
 lib/utils_disk.c       | 43 +++++++++++-----------------
 lib/utils_disk.h       | 10 +++----
 8 files changed, 104 insertions(+), 116 deletions(-)

diff --git a/lib/extra_opts.c b/lib/extra_opts.c
index 89b10560..b9843eba 100644
--- a/lib/extra_opts.c
+++ b/lib/extra_opts.c
@@ -26,15 +26,14 @@
 #include "extra_opts.h"
 
 /* FIXME: copied from utils.h; we should move a bunch of libs! */
-int
-is_option2 (char *str)
+bool is_option2 (char *str)
 {
 	if (!str)
-		return FALSE;
+		return false;
 	else if (strspn (str, "-") == 1 || strspn (str, "-") == 2)
-		return TRUE;
+		return true;
 	else
-		return FALSE;
+		return false;
 }
 
 /* this is the externally visible function used by plugins */
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index 57e60942..0cc864ae 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -131,7 +131,7 @@ np_get_defaults(const char *locator, const char *default_section)
 	if (inifile == NULL)
 		die(STATE_UNKNOWN, _("Can't read config file: %s\n"),
 		    strerror(errno));
-	if (read_defaults(inifile, i.stanza, &defaults) == FALSE)
+	if (!read_defaults(inifile, i.stanza, &defaults))
 		die(STATE_UNKNOWN,
 		    _("Invalid section '%s' in config file '%s'\n"), i.stanza,
 		    i.file);
@@ -157,7 +157,8 @@ np_get_defaults(const char *locator, const char *default_section)
 static int
 read_defaults(FILE *f, const char *stanza, np_arg_list **opts)
 {
-	int c, status = FALSE;
+	int c = 0;
+	bool status = false;
 	size_t i, stanza_len;
 	enum { NOSTANZA, WRONGSTANZA, RIGHTSTANZA } stanzastate = NOSTANZA;
 
@@ -219,7 +220,7 @@ read_defaults(FILE *f, const char *stanza, np_arg_list **opts)
 					die(STATE_UNKNOWN, "%s\n",
 					    _("Config file error"));
 				}
-				status = TRUE;
+				status = true;
 				break;
 			}
 			break;
diff --git a/lib/tests/test_disk.c b/lib/tests/test_disk.c
index 269d20b6..e283fe2e 100644
--- a/lib/tests/test_disk.c
+++ b/lib/tests/test_disk.c
@@ -44,19 +44,19 @@ main (int argc, char **argv)
 
 	plan_tests(33);
 
-	ok( np_find_name(exclude_filesystem, "/var/log") == FALSE, "/var/log not in list");
+	ok( np_find_name(exclude_filesystem, "/var/log") == false, "/var/log not in list");
 	np_add_name(&exclude_filesystem, "/var/log");
-	ok( np_find_name(exclude_filesystem, "/var/log") == TRUE, "is in list now");
-	ok( np_find_name(exclude_filesystem, "/home") == FALSE, "/home not in list");
+	ok( np_find_name(exclude_filesystem, "/var/log") == true, "is in list now");
+	ok( np_find_name(exclude_filesystem, "/home") == false, "/home not in list");
 	np_add_name(&exclude_filesystem, "/home");
-	ok( np_find_name(exclude_filesystem, "/home") == TRUE, "is in list now");
-	ok( np_find_name(exclude_filesystem, "/var/log") == TRUE, "/var/log still in list");
+	ok( np_find_name(exclude_filesystem, "/home") == true, "is in list now");
+	ok( np_find_name(exclude_filesystem, "/var/log") == true, "/var/log still in list");
 
-	ok( np_find_name(exclude_fstype, "iso9660") == FALSE, "iso9660 not in list");
+	ok( np_find_name(exclude_fstype, "iso9660") == false, "iso9660 not in list");
 	np_add_name(&exclude_fstype, "iso9660");
-	ok( np_find_name(exclude_fstype, "iso9660") == TRUE, "is in list now");
+	ok( np_find_name(exclude_fstype, "iso9660") == true, "is in list now");
 
-	ok( np_find_name(exclude_filesystem, "iso9660") == FALSE, "Make sure no clashing in variables");
+	ok( np_find_name(exclude_filesystem, "iso9660") == false, "Make sure no clashing in variables");
 
 	/*
 	for (temp_name = exclude_filesystem; temp_name; temp_name = temp_name->next) {
@@ -120,7 +120,7 @@ main (int argc, char **argv)
 	np_add_parameter(&paths, "/home/tonvoon");
 	np_add_parameter(&paths, "/dev/c2t0d0s0");
 
-	np_set_best_match(paths, dummy_mount_list, FALSE);
+	np_set_best_match(paths, dummy_mount_list, false);
 	for (p = paths; p; p = p->name_next) {
 		struct mount_entry *temp_me;
 		temp_me = p->best_match;
@@ -144,7 +144,7 @@ main (int argc, char **argv)
 	np_add_parameter(&paths, "/home/tonvoon");
 	np_add_parameter(&paths, "/home");
 
-	np_set_best_match(paths, dummy_mount_list, TRUE);
+	np_set_best_match(paths, dummy_mount_list, true);
 	for (p = paths; p; p = p->name_next) {
 		if (! strcmp(p->name, "/home/groups")) {
 			ok( ! p->best_match , "/home/groups correctly not found");
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index a109e3f4..01afacdc 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -62,99 +62,99 @@ main (int argc, char **argv)
 	range = parse_range_string("6");
 	ok( range != NULL, "'6' is valid range");
 	ok( range->start == 0, "Start correct");
-	ok( range->start_infinity == FALSE, "Not using negative infinity");
+	ok( range->start_infinity == false, "Not using negative infinity");
 	ok( range->end == 6, "End correct");
-	ok( range->end_infinity == FALSE, "Not using infinity");
+	ok( range->end_infinity == false, "Not using infinity");
 	free(range);
 
 	range = parse_range_string("1:12%%");
 	ok( range != NULL, "'1:12%%' is valid - percentages are ignored");
 	ok( range->start == 1, "Start correct");
-	ok( range->start_infinity == FALSE, "Not using negative infinity");
+	ok( range->start_infinity == false, "Not using negative infinity");
 	ok( range->end == 12, "End correct");
-	ok( range->end_infinity == FALSE, "Not using infinity");
+	ok( range->end_infinity == false, "Not using infinity");
 	free(range);
 
 	range = parse_range_string("-7:23");
 	ok( range != NULL, "'-7:23' is valid range");
 	ok( range->start == -7, "Start correct");
-	ok( range->start_infinity == FALSE, "Not using negative infinity");
+	ok( range->start_infinity == false, "Not using negative infinity");
 	ok( range->end == 23, "End correct");
-	ok( range->end_infinity == FALSE, "Not using infinity");
+	ok( range->end_infinity == false, "Not using infinity");
 	free(range);
 
 	range = parse_range_string(":5.75");
 	ok( range != NULL, "':5.75' is valid range");
 	ok( range->start == 0, "Start correct");
-	ok( range->start_infinity == FALSE, "Not using negative infinity");
+	ok( range->start_infinity == false, "Not using negative infinity");
 	ok( range->end == 5.75, "End correct");
-	ok( range->end_infinity == FALSE, "Not using infinity");
+	ok( range->end_infinity == false, "Not using infinity");
 	free(range);
 
 	range = parse_range_string("~:-95.99");
 	ok( range != NULL, "~:-95.99' is valid range");
-	ok( range->start_infinity == TRUE, "Using negative infinity");
+	ok( range->start_infinity == true, "Using negative infinity");
 	ok( range->end == -95.99, "End correct (with rounding errors)");
-	ok( range->end_infinity == FALSE, "Not using infinity");
+	ok( range->end_infinity == false, "Not using infinity");
 	free(range);
 
 	range = parse_range_string("12345678901234567890:");
 	temp = atof("12345678901234567890");		/* Can't just use this because number too large */
 	ok( range != NULL, "'12345678901234567890:' is valid range");
 	ok( range->start == temp, "Start correct");
-	ok( range->start_infinity == FALSE, "Not using negative infinity");
-	ok( range->end_infinity == TRUE, "Using infinity");
+	ok( range->start_infinity == false, "Not using negative infinity");
+	ok( range->end_infinity == true, "Using infinity");
 	/* Cannot do a "-1" on temp, as it appears to be same value */
-	ok( check_range(temp/1.1, range) == TRUE, "12345678901234567890/1.1 - alert");
-	ok( check_range(temp, range) == FALSE, "12345678901234567890 - no alert");
-	ok( check_range(temp*2, range) == FALSE, "12345678901234567890*2 - no alert");
+	ok( check_range(temp/1.1, range) == true, "12345678901234567890/1.1 - alert");
+	ok( check_range(temp, range) == false, "12345678901234567890 - no alert");
+	ok( check_range(temp*2, range) == false, "12345678901234567890*2 - no alert");
 	free(range);
 
 	range = parse_range_string("~:0");
 	ok( range != NULL, "'~:0' is valid range");
-	ok( range->start_infinity == TRUE, "Using negative infinity");
+	ok( range->start_infinity == true, "Using negative infinity");
 	ok( range->end == 0, "End correct");
-	ok( range->end_infinity == FALSE, "Not using infinity");
+	ok( range->end_infinity == false, "Not using infinity");
 	ok( range->alert_on == OUTSIDE, "Will alert on outside of this range");
-	ok( check_range(0.5, range) == TRUE, "0.5 - alert");
-	ok( check_range(-10, range) == FALSE, "-10 - no alert");
-	ok( check_range(0, range)   == FALSE, "0 - no alert");
+	ok( check_range(0.5, range) == true, "0.5 - alert");
+	ok( check_range(-10, range) == false, "-10 - no alert");
+	ok( check_range(0, range)   == false, "0 - no alert");
 	free(range);
-	
+
 	range = parse_range_string("@0:657.8210567");
 	ok( range != 0, "@0:657.8210567' is a valid range");
 	ok( range->start == 0, "Start correct");
-	ok( range->start_infinity == FALSE, "Not using negative infinity");
+	ok( range->start_infinity == false, "Not using negative infinity");
 	ok( range->end == 657.8210567, "End correct");
-	ok( range->end_infinity == FALSE, "Not using infinity");
+	ok( range->end_infinity == false, "Not using infinity");
 	ok( range->alert_on == INSIDE, "Will alert on inside of this range" );
-	ok( check_range(32.88, range) == TRUE, "32.88 - alert");
-	ok( check_range(-2, range)    == FALSE, "-2 - no alert");
-	ok( check_range(657.8210567, range) == TRUE, "657.8210567 - alert");
-	ok( check_range(0, range)     == TRUE, "0 - alert");
+	ok( check_range(32.88, range) == true, "32.88 - alert");
+	ok( check_range(-2, range)    == false, "-2 - no alert");
+	ok( check_range(657.8210567, range) == true, "657.8210567 - alert");
+	ok( check_range(0, range)     == true, "0 - alert");
 	free(range);
 
 	range = parse_range_string("@1:1");
 	ok( range != NULL, "'@1:1' is a valid range");
 	ok( range->start == 1, "Start correct");
-	ok( range->start_infinity == FALSE, "Not using negative infinity");
+	ok( range->start_infinity == false, "Not using negative infinity");
 	ok( range->end == 1, "End correct");
-	ok( range->end_infinity == FALSE, "Not using infinity");
+	ok( range->end_infinity == false, "Not using infinity");
 	ok( range->alert_on == INSIDE, "Will alert on inside of this range" );
-	ok( check_range(0.5, range) == FALSE, "0.5 - no alert");
-	ok( check_range(1, range) == TRUE, "1 - alert");
-	ok( check_range(5.2, range) == FALSE, "5.2 - no alert");
+	ok( check_range(0.5, range) == false, "0.5 - no alert");
+	ok( check_range(1, range) == true, "1 - alert");
+	ok( check_range(5.2, range) == false, "5.2 - no alert");
 	free(range);
 
 	range = parse_range_string("1:1");
 	ok( range != NULL, "'1:1' is a valid range");
 	ok( range->start == 1, "Start correct");
-	ok( range->start_infinity == FALSE, "Not using negative infinity");
+	ok( range->start_infinity == false, "Not using negative infinity");
 	ok( range->end == 1, "End correct");
-	ok( range->end_infinity == FALSE, "Not using infinity");
-	ok( check_range(0.5, range) == TRUE, "0.5 - alert");
-	ok( check_range(1, range) == FALSE, "1 - no alert");
-	ok( check_range(5.2, range) == TRUE, "5.2 - alert");
+	ok( range->end_infinity == false, "Not using infinity");
+	ok( check_range(0.5, range) == true, "0.5 - alert");
+	ok( check_range(1, range) == false, "1 - no alert");
+	ok( check_range(5.2, range) == true, "5.2 - alert");
 	free(range);
 
 	range = parse_range_string("2:1");
@@ -459,7 +459,7 @@ main (int argc, char **argv)
 
 	ok(this_monitoring_plugin==NULL, "Free'd this_monitoring_plugin");
 
-	ok(mp_suid() == FALSE, "Test aren't suid");
+	ok(mp_suid() == false, "Test aren't suid");
 
 	/* base states with random case */
 	char *states[] = {
diff --git a/lib/utils_base.c b/lib/utils_base.c
index eabcd7ee..3c7221c8 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -40,7 +40,7 @@ monitoring_plugin *this_monitoring_plugin=NULL;
 unsigned int timeout_state = STATE_CRITICAL;
 unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT;
 
-int _np_state_read_file(FILE *);
+bool _np_state_read_file(FILE *);
 
 void np_init( char *plugin_name, int argc, char **argv ) {
 	if (this_monitoring_plugin==NULL) {
@@ -105,12 +105,12 @@ die (int result, const char *fmt, ...)
 
 void set_range_start (range *this, double value) {
 	this->start = value;
-	this->start_infinity = FALSE;
+	this->start_infinity = false;
 }
 
 void set_range_end (range *this, double value) {
 	this->end = value;
-	this->end_infinity = FALSE;
+	this->end_infinity = false;
 }
 
 range
@@ -124,9 +124,9 @@ range
 
 	/* Set defaults */
 	temp_range->start = 0;
-	temp_range->start_infinity = FALSE;
+	temp_range->start_infinity = false;
 	temp_range->end = 0;
-	temp_range->end_infinity = TRUE;
+	temp_range->end_infinity = true;
 	temp_range->alert_on = OUTSIDE;
 	temp_range->text = strdup(str);
 
@@ -138,7 +138,7 @@ range
 	end_str = index(str, ':');
 	if (end_str != NULL) {
 		if (str[0] == '~') {
-			temp_range->start_infinity = TRUE;
+			temp_range->start_infinity = true;
 		} else {
 			start = strtod(str, NULL);	/* Will stop at the ':' */
 			set_range_start(temp_range, start);
@@ -152,8 +152,8 @@ range
 		set_range_end(temp_range, end);
 	}
 
-	if (temp_range->start_infinity == TRUE ||
-		temp_range->end_infinity == TRUE ||
+	if (temp_range->start_infinity == true ||
+		temp_range->end_infinity == true ||
 		temp_range->start <= temp_range->end) {
 		return temp_range;
 	}
@@ -223,31 +223,30 @@ void print_thresholds(const char *threshold_name, thresholds *my_threshold) {
 	printf("\n");
 }
 
-/* Returns TRUE if alert should be raised based on the range */
-int
-check_range(double value, range *my_range)
+/* Returns true if alert should be raised based on the range */
+bool check_range(double value, range *my_range)
 {
-	int no = FALSE;
-	int yes = TRUE;
+	bool no = false;
+	bool yes = true;
 
 	if (my_range->alert_on == INSIDE) {
-		no = TRUE;
-		yes = FALSE;
+		no = true;
+		yes = false;
 	}
 
-	if (my_range->end_infinity == FALSE && my_range->start_infinity == FALSE) {
+	if (my_range->end_infinity == false && my_range->start_infinity == false) {
 		if ((my_range->start <= value) && (value <= my_range->end)) {
 			return no;
 		} else {
 			return yes;
 		}
-	} else if (my_range->start_infinity == FALSE && my_range->end_infinity == TRUE) {
+	} else if (my_range->start_infinity == false && my_range->end_infinity == true) {
 		if (my_range->start <= value) {
 			return no;
 		} else {
 			return yes;
 		}
-	} else if (my_range->start_infinity == TRUE && my_range->end_infinity == FALSE) {
+	} else if (my_range->start_infinity == true && my_range->end_infinity == false) {
 		if (value <= my_range->end) {
 			return no;
 		} else {
@@ -263,12 +262,12 @@ int
 get_status(double value, thresholds *my_thresholds)
 {
 	if (my_thresholds->critical != NULL) {
-		if (check_range(value, my_thresholds->critical) == TRUE) {
+		if (check_range(value, my_thresholds->critical) == true) {
 			return STATE_CRITICAL;
 		}
 	}
 	if (my_thresholds->warning != NULL) {
-		if (check_range(value, my_thresholds->warning) == TRUE) {
+		if (check_range(value, my_thresholds->warning) == true) {
 			return STATE_WARNING;
 		}
 	}
@@ -465,7 +464,7 @@ char* _np_state_calculate_location_prefix(){
 
 	/* Do not allow passing MP_STATE_PATH in setuid plugins
 	 * for security reasons */
-	if (mp_suid() == FALSE) {
+	if (!mp_suid()) {
 		env_dir = getenv("MP_STATE_PATH");
 		if(env_dir && env_dir[0] != '\0')
 			return env_dir;
@@ -541,7 +540,7 @@ void np_enable_state(char *keyname, int expected_data_version) {
 state_data *np_state_read() {
 	state_data *this_state_data=NULL;
 	FILE *statefile;
-	int rc = FALSE;
+	bool rc = false;
 
 	if(this_monitoring_plugin==NULL)
 		die(STATE_UNKNOWN, _("This requires np_init to be called"));
@@ -563,7 +562,7 @@ state_data *np_state_read() {
 		fclose(statefile);
 	}
 
-	if(rc==FALSE) {
+	if(!rc) {
 		_cleanup_state_data();
 	}
 
@@ -573,8 +572,8 @@ state_data *np_state_read() {
 /*
  * Read the state file
  */
-int _np_state_read_file(FILE *f) {
-	int status=FALSE;
+bool _np_state_read_file(FILE *f) {
+	bool status = false;
 	size_t pos;
 	char *line;
 	int i;
@@ -628,7 +627,7 @@ int _np_state_read_file(FILE *f) {
 				if(this_monitoring_plugin->state->state_data->data==NULL)
 					die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
 				expected=STATE_DATA_END;
-				status=TRUE;
+				status=true;
 				break;
 			case STATE_DATA_END:
 				;
diff --git a/lib/utils_base.h b/lib/utils_base.h
index 9abf5957..80b87435 100644
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -21,7 +21,7 @@
 
 typedef struct range_struct {
 	double	start;
-	int	start_infinity;		/* FALSE (default) or TRUE */
+	bool start_infinity;
 	double	end;
 	int	end_infinity;
 	int	alert_on;		/* OUTSIDE (default) or INSIDE */
@@ -61,7 +61,7 @@ range *parse_range_string (char *);
 int _set_thresholds(thresholds **, char *, char *);
 void set_thresholds(thresholds **, char *, char *);
 void print_thresholds(const char *, thresholds *);
-int check_range(double, range *);
+bool check_range(double, range *);
 int get_status(double, thresholds *);
 
 /* Handle timeouts */
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
index 5e95aef6..483be06d 100644
--- a/lib/utils_disk.c
+++ b/lib/utils_disk.c
@@ -170,9 +170,7 @@ np_find_parameter(struct parameter_list *list, const char *name)
   return NULL;
 }
 
-void
-np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list, int exact)
-{
+void np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list, bool exact) {
   struct parameter_list *d;
   for (d = desired; d; d= d->name_next) {
     if (! d->best_match) {
@@ -195,9 +193,9 @@ np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list
       if (! best_match) {
         for (me = mount_list; me; me = me->me_next) {
           size_t len = strlen (me->me_mountdir);
-          if ((exact == FALSE && (best_match_len <= len && len <= name_len &&
+          if ((!exact && (best_match_len <= len && len <= name_len &&
              (len == 1 || strncmp (me->me_mountdir, d->name, len) == 0)))
-             || (exact == TRUE && strcmp(me->me_mountdir, d->name)==0))
+             || (exact && strcmp(me->me_mountdir, d->name)==0))
           {
             if (get_fs_usage(me->me_mountdir, me->me_devname, &fsp) >= 0) {
               best_match = me;
@@ -216,27 +214,23 @@ np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list
   }
 }
 
-/* Returns TRUE if name is in list */
-int
-np_find_name (struct name_list *list, const char *name)
-{
+/* Returns true if name is in list */
+bool np_find_name (struct name_list *list, const char *name) {
   const struct name_list *n;
 
   if (list == NULL || name == NULL) {
-    return FALSE;
+    return false;
   }
   for (n = list; n; n = n->next) {
     if (!strcmp(name, n->name)) {
-      return TRUE;
+      return true;
     }
   }
-  return FALSE;
+  return false;
 }
 
-/* Returns TRUE if name is in list */
-bool
-np_find_regmatch (struct regex_list *list, const char *name)
-{
+/* Returns true if name is in list */
+bool np_find_regmatch (struct regex_list *list, const char *name) {
   int len;
   regmatch_t m;
 
@@ -257,25 +251,20 @@ np_find_regmatch (struct regex_list *list, const char *name)
   return false;
 }
 
-int
-np_seen_name(struct name_list *list, const char *name)
-{
+bool np_seen_name(struct name_list *list, const char *name) {
   const struct name_list *s;
   for (s = list; s; s=s->next) {
     if (!strcmp(s->name, name)) {
-      return TRUE;
+      return true;
     }
   }
-  return FALSE;
+  return false;
 }
 
-int
-np_regex_match_mount_entry (struct mount_entry* me, regex_t* re)
-{
+bool np_regex_match_mount_entry (struct mount_entry* me, regex_t* re) {
   if (regexec(re, me->me_devname, (size_t) 0, NULL, 0) == 0 ||
       regexec(re, me->me_mountdir, (size_t) 0, NULL, 0) == 0 ) {
-    return TRUE;
-  } else {
-    return FALSE;
+    return true;
   }
+	return false;
 }
diff --git a/lib/utils_disk.h b/lib/utils_disk.h
index 6b83ac74..5b2caf23 100644
--- a/lib/utils_disk.h
+++ b/lib/utils_disk.h
@@ -39,14 +39,14 @@ struct parameter_list
 };
 
 void np_add_name (struct name_list **list, const char *name);
-int np_find_name (struct name_list *list, const char *name);
-int np_seen_name (struct name_list *list, const char *name);
+bool np_find_name (struct name_list *list, const char *name);
+bool np_seen_name (struct name_list *list, const char *name);
 int np_add_regex (struct regex_list **list, const char *regex, int cflags);
 bool np_find_regmatch (struct regex_list *list, const char *name);
 struct parameter_list *np_add_parameter(struct parameter_list **list, const char *name);
 struct parameter_list *np_find_parameter(struct parameter_list *list, const char *name);
 struct parameter_list *np_del_parameter(struct parameter_list *item, struct parameter_list *prev);
-  
+
 int search_parameter_list (struct parameter_list *list, const char *name);
-void np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list, int exact);
-int np_regex_match_mount_entry (struct mount_entry* me, regex_t* re);
+void np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list, bool exact);
+bool np_regex_match_mount_entry (struct mount_entry* me, regex_t* re);
-- 
cgit v1.2.3-74-g34f1