summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/NEW_STARTERS2
-rw-r--r--doc/RELEASING.md2
-rw-r--r--doc/developer-guidelines.sgml10
-rw-r--r--lib/extra_opts.c2
-rw-r--r--lib/extra_opts.h2
-rw-r--r--lib/output.c4
-rw-r--r--lib/parse_ini.c2
-rw-r--r--lib/perfdata.c2
-rw-r--r--lib/states.h2
-rwxr-xr-xtools/distclean2
-rw-r--r--tools/p1.pl2
11 files changed, 16 insertions, 16 deletions
diff --git a/doc/NEW_STARTERS b/doc/NEW_STARTERS
index 2c5aac88..4fda35fb 100644
--- a/doc/NEW_STARTERS
+++ b/doc/NEW_STARTERS
@@ -10,7 +10,7 @@ Need to know:
10 10
111. Add member to team mailing list (https://www.monitoring-plugins.org/list/listinfo/team/) 111. Add member to team mailing list (https://www.monitoring-plugins.org/list/listinfo/team/)
12 and to the commits mailing list (https://www.monitoring-plugins.org/list/listinfo/commits/), 12 and to the commits mailing list (https://www.monitoring-plugins.org/list/listinfo/commits/),
13 add sourceforge email address via Privacy Options->Sender filters) 13 add sourceforge email address via Privacy Options->Sender filters
142. Add Sourceforge access: 142. Add Sourceforge access:
15 - Translator: CVS access, Shell access, Release Tech (no) 15 - Translator: CVS access, Shell access, Release Tech (no)
16 - Developer: Project role: Developer, CVS access, Shell access, Release Tech (no), Task Manager (A&T), 16 - Developer: Project role: Developer, CVS access, Shell access, Release Tech (no), Task Manager (A&T),
diff --git a/doc/RELEASING.md b/doc/RELEASING.md
index e1f3bf74..700683e7 100644
--- a/doc/RELEASING.md
+++ b/doc/RELEASING.md
@@ -9,7 +9,7 @@ using the remote name `monitoring-plugins` (rather than `origin`).
9Before you start 9Before you start
10---------------- 10----------------
11 11
12- Check Github Actions status. 12- Check GitHub Actions status.
13- Update local Git repository to the current `master` tip. For a 13- Update local Git repository to the current `master` tip. For a
14 maintenance release (e.g., version 2.4.1), update to the current 14 maintenance release (e.g., version 2.4.1), update to the current
15 `maint-2.4` tip, instead. 15 `maint-2.4` tip, instead.
diff --git a/doc/developer-guidelines.sgml b/doc/developer-guidelines.sgml
index 0afa733b..8288b897 100644
--- a/doc/developer-guidelines.sgml
+++ b/doc/developer-guidelines.sgml
@@ -23,9 +23,9 @@
23 23
24 24
25<preface id="preface"><title>Preface</title> 25<preface id="preface"><title>Preface</title>
26 <para>The purpose of this guidelines is to provide a reference for 26 <para>The purpose of these guidelines is to provide a reference for
27 the plugin developers and encourage the standardization of the 27 the plugin developers and encourage the standardization of the
28 different kind of plugins: C, shell, perl, python, etc.</para> 28 different kinds of plugins: C, shell, perl, python, etc.</para>
29 29
30 <para>Monitoring Plugins Development Guidelines Copyright (C) 2000-2024 30 <para>Monitoring Plugins Development Guidelines Copyright (C) 2000-2024
31 (Monitoring Plugins Team)</para> 31 (Monitoring Plugins Team)</para>
@@ -68,7 +68,7 @@
68 68
69 <para>You should always print something to STDOUT that tells if the 69 <para>You should always print something to STDOUT that tells if the
70 service is working or why it is failing. Try to keep the output short - 70 service is working or why it is failing. Try to keep the output short -
71 probably less that 80 characters. Remember that you ideally would like 71 probably less than 80 characters. Remember that you ideally would like
72 the entire output to appear in a pager message, which will get chopped 72 the entire output to appear in a pager message, which will get chopped
73 off after a certain length.</para> 73 off after a certain length.</para>
74 74
@@ -214,7 +214,7 @@
214 back a numerical value, or metric, which is then compared to the warning and 214 back a numerical value, or metric, which is then compared to the warning and
215 critical thresholds. Use the get_status(double, thresholds *) function to 215 critical thresholds. Use the get_status(double, thresholds *) function to
216 compare the value against the thresholds.</para> 216 compare the value against the thresholds.</para>
217 <para>This is the generalised format for ranges:</para> 217 <para>This is the generalized format for ranges:</para>
218 218
219 <literallayout> 219 <literallayout>
220 [@]start:end 220 [@]start:end
@@ -474,7 +474,7 @@
474 </listitem> 474 </listitem>
475 475
476 <listitem><para>If writing to a file (perhaps recording 476 <listitem><para>If writing to a file (perhaps recording
477 performance data) explicitly close close it. The plugin never 477 performance data) explicitly close it. The plugin never
478 calls <emphasis role="strong">exit</emphasis>; that is caught by 478 calls <emphasis role="strong">exit</emphasis>; that is caught by
479 p1.pl, so output streams are never closed.</para> 479 p1.pl, so output streams are never closed.</para>
480 </listitem> 480 </listitem>
diff --git a/lib/extra_opts.c b/lib/extra_opts.c
index 3fe69014..fa64d650 100644
--- a/lib/extra_opts.c
+++ b/lib/extra_opts.c
@@ -120,7 +120,7 @@ char **np_extra_opts(int *argc, char **argv, const char *plugin_name) {
120 } 120 }
121 ea1 = ea_tmp = NULL; 121 ea1 = ea_tmp = NULL;
122 } 122 }
123 } /* lather, rince, repeat */ 123 } /* lather, rinse, repeat */
124 124
125 if (ea_num == (size_t)*argc && extra_args == NULL) { 125 if (ea_num == (size_t)*argc && extra_args == NULL) {
126 /* No extra-opts */ 126 /* No extra-opts */
diff --git a/lib/extra_opts.h b/lib/extra_opts.h
index 3f64360f..3c2d5eb1 100644
--- a/lib/extra_opts.h
+++ b/lib/extra_opts.h
@@ -8,7 +8,7 @@
8 8
9/* np_extra_opts: Process the --extra-opts arguments and create a new argument 9/* np_extra_opts: Process the --extra-opts arguments and create a new argument
10 * array with ini-processed and argument-passed arguments together. The 10 * array with ini-processed and argument-passed arguments together. The
11 * ini-procesed arguments always come first (in the order of --extra-opts 11 * ini-processed arguments always come first (in the order of --extra-opts
12 * arguments). If no --extra-opts arguments are provided or returned nothing 12 * arguments). If no --extra-opts arguments are provided or returned nothing
13 * it returns **argv otherwise the new array is returned. --extra-opts are 13 * it returns **argv otherwise the new array is returned. --extra-opts are
14 * always removed from **argv. The original pointers from **argv are kept in 14 * always removed from **argv. The original pointers from **argv are kept in
diff --git a/lib/output.c b/lib/output.c
index d650a3c5..d1a8d3b9 100644
--- a/lib/output.c
+++ b/lib/output.c
@@ -165,7 +165,7 @@ int mp_add_subcheck_to_subcheck(mp_subcheck check[static 1], mp_subcheck subchec
165void mp_add_summary(mp_check check[static 1], char *summary) { check->summary = summary; } 165void mp_add_summary(mp_check check[static 1], char *summary) { check->summary = summary; }
166 166
167/* 167/*
168 * Generate the summary string of a mp_check object based on it's subchecks 168 * Generate the summary string of a mp_check object based on its subchecks
169 */ 169 */
170char *get_subcheck_summary(mp_check check) { 170char *get_subcheck_summary(mp_check check) {
171 mp_subcheck_list *subchecks = check.subchecks; 171 mp_subcheck_list *subchecks = check.subchecks;
@@ -243,7 +243,7 @@ mp_state_enum mp_compute_check_state(const mp_check check) {
243} 243}
244 244
245/* 245/*
246 * Generate the result state of a mp_check object based on it's own state and it's subchecks states 246 * Generate the result state of a mp_check object based on its own state and its subchecks states
247 */ 247 */
248mp_state_enum mp_eval_check_default(const mp_check check) { 248mp_state_enum mp_eval_check_default(const mp_check check) {
249 assert(check.subchecks != NULL); // a mp_check without subchecks is invalid, die here 249 assert(check.subchecks != NULL); // a mp_check without subchecks is invalid, die here
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index 196cac79..8a54af58 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -173,7 +173,7 @@ static bool read_defaults(FILE *defaults_file, const char *stanza, np_arg_list *
173 continue; 173 continue;
174 } 174 }
175 switch (current_char) { 175 switch (current_char) {
176 /* globble up comment lines */ 176 /* gobble up comment lines */
177 case ';': 177 case ';':
178 case '#': 178 case '#':
179 GOBBLE_TO(defaults_file, current_char, '\n'); 179 GOBBLE_TO(defaults_file, current_char, '\n');
diff --git a/lib/perfdata.c b/lib/perfdata.c
index 2930a8bc..b447b8ea 100644
--- a/lib/perfdata.c
+++ b/lib/perfdata.c
@@ -37,7 +37,7 @@ char *pd_to_string(mp_perfdata pd) {
37 if (strchr(pd.label, '\'') == NULL) { 37 if (strchr(pd.label, '\'') == NULL) {
38 asprintf(&result, "'%s'=", pd.label); 38 asprintf(&result, "'%s'=", pd.label);
39 } else { 39 } else {
40 // we have a illegal single quote in the string 40 // we have an illegal single quote in the string
41 // replace it silently instead of complaining 41 // replace it silently instead of complaining
42 for (char *ptr = pd.label; *ptr == '\0'; ptr++) { 42 for (char *ptr = pd.label; *ptr == '\0'; ptr++) {
43 if (*ptr == '\'') { 43 if (*ptr == '\'') {
diff --git a/lib/states.h b/lib/states.h
index 4a170caa..43926f0c 100644
--- a/lib/states.h
+++ b/lib/states.h
@@ -45,7 +45,7 @@ static inline mp_state_enum max_state(mp_state_enum a, mp_state_enum b) {
45 * STATE_OK < STATE_DEPENDENT < STATE_UNKNOWN < STATE_WARNING < STATE_CRITICAL 45 * STATE_OK < STATE_DEPENDENT < STATE_UNKNOWN < STATE_WARNING < STATE_CRITICAL
46 * 46 *
47 * The main difference between max_state_alt and max_state it that it doesn't 47 * The main difference between max_state_alt and max_state it that it doesn't
48 * allow setting a default to UNKNOWN. It will instead prioritixe any valid 48 * allow setting a default to UNKNOWN. It will instead prioritize any valid
49 * non-OK state. 49 * non-OK state.
50 ****************************************************************************/ 50 ****************************************************************************/
51 51
diff --git a/tools/distclean b/tools/distclean
index 961cc801..1ddc7532 100755
--- a/tools/distclean
+++ b/tools/distclean
@@ -37,7 +37,7 @@ find . -type f -name Makefile.in -print| xargs rm -f
37rm -f aclocal.m4 compile config.guess config.h.in config.sub configure depcomp 37rm -f aclocal.m4 compile config.guess config.h.in config.sub configure depcomp
38rm -f m4/Makefile.am 38rm -f m4/Makefile.am
39 39
40echo "$0: Removing miscelanious files..." 40echo "$0: Removing miscellaneous files..."
41rm -f po/*.gmo po/stamp-po 41rm -f po/*.gmo po/stamp-po
42rm -f lib/tests/*.Po 42rm -f lib/tests/*.Po
43rm -f doc/developer-guidelines.html 43rm -f doc/developer-guidelines.html
diff --git a/tools/p1.pl b/tools/p1.pl
index 9cbe6dc0..ea80c334 100644
--- a/tools/p1.pl
+++ b/tools/p1.pl
@@ -30,7 +30,7 @@ use IO::File;
30 30
31sub TIEHANDLE { 31sub TIEHANDLE {
32 my ($class, $fn) = @_; 32 my ($class, $fn) = @_;
33 my $handle = new IO::File "> $fn" or die "Cannot open embedded work filei $!\n"; 33 my $handle = new IO::File "> $fn" or die "Cannot open embedded work file $!\n";
34 bless { FH => $handle, Value => 0}, $class; 34 bless { FH => $handle, Value => 0}, $class;
35} 35}
36 36