9 files changed, 32 insertions, 29 deletions

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) {
                         }
                         ea1 = ea_tmp = NULL;
                 }
-        } /* lather, rince, repeat */
+        } /* lather, rinse, repeat */
 
         if (ea_num == (size_t)*argc && extra_args == NULL) {
                 /* 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 @@
 
 /* np_extra_opts: Process the --extra-opts arguments and create a new argument
  * array with ini-processed and argument-passed arguments together. The
- * ini-procesed arguments always come first (in the order of --extra-opts
+ * ini-processed arguments always come first (in the order of --extra-opts
  * arguments). If no --extra-opts arguments are provided or returned nothing
  * it returns **argv otherwise the new array is returned. --extra-opts are
  * always removed from **argv. The original pointers from **argv are kept in
diff --git a/lib/output.c b/lib/output.c
index f283969f..d1a8d3b9 100644
--- a/lib/output.c
+++ b/lib/output.c
@@ -42,7 +42,7 @@ static inline char *fmt_subcheck_perfdata(mp_subcheck check) {
 
         while (subchecks != NULL) {
                 if (added > 0) {
-                        added = asprintf(&result, "%s%s", result, fmt_subcheck_perfdata(subchecks->subcheck));
+                        added = asprintf(&result, "%s %s", result, fmt_subcheck_perfdata(subchecks->subcheck));
                 } else {
                         // TODO free previous result here?
                         added = asprintf(&result, "%s", fmt_subcheck_perfdata(subchecks->subcheck));
@@ -165,7 +165,7 @@ int mp_add_subcheck_to_subcheck(mp_subcheck check[static 1], mp_subcheck subchec
 void mp_add_summary(mp_check check[static 1], char *summary) { check->summary = summary; }
 
 /*
- * Generate the summary string of a mp_check object based on it's subchecks
+ * Generate the summary string of a mp_check object based on its subchecks
  */
 char *get_subcheck_summary(mp_check check) {
         mp_subcheck_list *subchecks = check.subchecks;
@@ -175,7 +175,7 @@ char *get_subcheck_summary(mp_check check) {
         unsigned int critical = 0;
         unsigned int unknown = 0;
         while (subchecks != NULL) {
-                switch (subchecks->subcheck.state) {
+                switch (mp_compute_subcheck_state(subchecks->subcheck)) {
                 case STATE_OK:
                         ok++;
                         break;
@@ -243,7 +243,7 @@ mp_state_enum mp_compute_check_state(const mp_check check) {
 }
 
 /*
- * Generate the result state of a mp_check object based on it's own state and it's subchecks states
+ * Generate the result state of a mp_check object based on its own state and its subchecks states
  */
 mp_state_enum mp_eval_check_default(const mp_check check) {
         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 db337622..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 *
                         continue;
                 }
                 switch (current_char) {
-                        /* globble up comment lines */
+                        /* gobble up comment lines */
                 case ';':
                 case '#':
                         GOBBLE_TO(defaults_file, current_char, '\n');
@@ -352,15 +352,17 @@ static int add_option(FILE *filePointer, np_arg_list **optlst) {
         optnew->next = NULL;
 
         read_pos = 0;
-        optnew->arg = malloc(cfg_len + 1);
+        size_t arg_length = cfg_len + 1;
+        optnew->arg = malloc(arg_length);
         /* 1-character params needs only one dash */
         if (opt_len == 1) {
-                strncpy(&optnew->arg[read_pos], "-", 1);
+                strncpy(&optnew->arg[read_pos], "-", arg_length);
                 read_pos += 1;
         } else {
-                strncpy(&optnew->arg[read_pos], "--", 2);
+                strncpy(&optnew->arg[read_pos], "--", arg_length);
                 read_pos += 2;
         }
+
         strncpy(&optnew->arg[read_pos], optptr, opt_len);
         read_pos += opt_len;
         if (value) {
diff --git a/lib/perfdata.c b/lib/perfdata.c
index 2930a8bc..f4eaf843 100644
--- a/lib/perfdata.c
+++ b/lib/perfdata.c
@@ -37,9 +37,9 @@ char *pd_to_string(mp_perfdata pd) {
         if (strchr(pd.label, '\'') == NULL) {
                 asprintf(&result, "'%s'=", pd.label);
         } else {
-                // we have a illegal single quote in the string
+                // we have an illegal single quote in the string
                 // replace it silently instead of complaining
-                for (char *ptr = pd.label; *ptr == '\0'; ptr++) {
+                for (char *ptr = pd.label; *ptr != '\0'; ptr++) {
                         if (*ptr == '\'') {
                                 *ptr = '_';
                         }
@@ -393,7 +393,7 @@ mp_range_parsed mp_parse_range_string(const char *input) {
 
         mp_range_parsed result = {
                 .range = mp_range_init(),
-                .error = MP_PARSING_SUCCES,
+                .error = MP_PARSING_SUCCESS,
         };
 
         if (input[0] == '@') {
@@ -436,7 +436,7 @@ mp_range_parsed mp_parse_range_string(const char *input) {
                         result.range.start_infinity = false;
                         perfdata_value_parser_wrapper parsed_pd = parse_pd_value(input);
 
-                        if (parsed_pd.error != MP_PARSING_SUCCES) {
+                        if (parsed_pd.error != MP_PARSING_SUCCESS) {
                                 result.error = parsed_pd.error;
                                 free(working_copy);
                                 return result;
@@ -457,7 +457,7 @@ mp_range_parsed mp_parse_range_string(const char *input) {
         } else {
                 perfdata_value_parser_wrapper parsed_pd = parse_pd_value(input);
 
-                if (parsed_pd.error != MP_PARSING_SUCCES) {
+                if (parsed_pd.error != MP_PARSING_SUCCESS) {
                         result.error = parsed_pd.error;
                         return result;
                 }
@@ -470,7 +470,7 @@ mp_range_parsed mp_parse_range_string(const char *input) {
 
 double_parser_wrapper parse_double(const char *input) {
         double_parser_wrapper result = {
-                .error = MP_PARSING_SUCCES,
+                .error = MP_PARSING_SUCCESS,
         };
 
         if (input == NULL) {
@@ -501,7 +501,7 @@ double_parser_wrapper parse_double(const char *input) {
 
 integer_parser_wrapper parse_integer(const char *input) {
         integer_parser_wrapper result = {
-                .error = MP_PARSING_SUCCES,
+                .error = MP_PARSING_SUCCESS,
         };
 
         if (input == NULL) {
@@ -548,7 +548,7 @@ perfdata_value_parser_wrapper parse_pd_value(const char *input) {
         // try integer first
         integer_parser_wrapper tmp_int = parse_integer(input);
 
-        if (tmp_int.error == MP_PARSING_SUCCES) {
+        if (tmp_int.error == MP_PARSING_SUCCESS) {
                 perfdata_value_parser_wrapper result = {
                         .error = tmp_int.error,
                         .value = tmp_int.value,
@@ -558,7 +558,7 @@ perfdata_value_parser_wrapper parse_pd_value(const char *input) {
 
         double_parser_wrapper tmp_double = parse_double(input);
         perfdata_value_parser_wrapper result = {};
-        if (tmp_double.error == MP_PARSING_SUCCES) {
+        if (tmp_double.error == MP_PARSING_SUCCESS) {
                 result.error = tmp_double.error;
                 result.value = tmp_double.value;
         } else {
diff --git a/lib/perfdata.h b/lib/perfdata.h
index e51ef5fd..d7e5670a 100644
--- a/lib/perfdata.h
+++ b/lib/perfdata.h
@@ -111,7 +111,8 @@ mp_range mp_range_set_end(mp_range, mp_perfdata_value);
  */
 
 typedef enum {
-        MP_PARSING_SUCCES = 0,
+        MP_PARSING_SUCCESS = 0,
+        MP_PARSING_SUCCES = MP_PARSING_SUCCESS,
         MP_PARSING_FAILURE,
         MP_RANGE_PARSING_FAILURE,
         MP_RANGE_PARSING_UNDERFLOW,
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) {
  * STATE_OK < STATE_DEPENDENT < STATE_UNKNOWN < STATE_WARNING < STATE_CRITICAL
  *
  * The main difference between max_state_alt and max_state it that it doesn't
- * allow setting a default to UNKNOWN. It will instead prioritixe any valid
+ * allow setting a default to UNKNOWN. It will instead prioritize any valid
  * non-OK state.
  ****************************************************************************/
 
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index 42c81793..23d42168 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -489,14 +489,14 @@ cmd_run_result cmd_run2(const char *cmd_string, int flags) {
         cmd_run_result result = {
                 .cmd_error_code = 0,
                 .error_code = 0,
-                .stderr =
+                .err =
                         {
                                 .buf = NULL,
                                 .buflen = 0,
                                 .line = NULL,
                                 .lines = 0,
                         },
-                .stdout =
+                .out =
                         {
                                 .buf = NULL,
                                 .buflen = 0,
@@ -581,14 +581,14 @@ cmd_run_result cmd_run_array2(char *const *cmd, int flags) {
         cmd_run_result result = {
                 .cmd_error_code = 0,
                 .error_code = 0,
-                .stderr =
+                .err =
                         {
                                 .buf = NULL,
                                 .buflen = 0,
                                 .line = NULL,
                                 .lines = 0,
                         },
-                .stdout =
+                .out =
                         {
                                 .buf = NULL,
                                 .buflen = 0,
@@ -610,9 +610,9 @@ cmd_run_result cmd_run_array2(char *const *cmd, int flags) {
         int pfd_err[2] = {cmd_open_result.stderr_pipe_fd[0], cmd_open_result.stderr_pipe_fd[1]};
 
         int_cmd_fetch_output2 tmp_stdout = _cmd_fetch_output2(pfd_out[0], flags);
-        result.stdout = tmp_stdout.output_container;
+        result.out = tmp_stdout.output_container;
         int_cmd_fetch_output2 tmp_stderr = _cmd_fetch_output2(pfd_err[0], flags);
-        result.stderr = tmp_stderr.output_container;
+        result.err = tmp_stderr.output_container;
 
         result.cmd_error_code = _cmd_close(file_descriptor);
         return result;
diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h
index d3a8f14f..04a624b8 100644
--- a/lib/utils_cmd.h
+++ b/lib/utils_cmd.h
@@ -24,8 +24,8 @@ int cmd_file_read(const char *, output *, int);
 typedef struct {
  int error_code;
  int cmd_error_code;
- output stdout;
- output stderr;
+ output out;
+ output err;
 } cmd_run_result;
 cmd_run_result cmd_run2(const char *cmd, int flags);
 cmd_run_result cmd_run_array2(char * const *cmd, int flags);