Merge pull request #1491 from evgenyz/fix_lgtm_warnings

Fix LGTM warnings

Author: jan-cerny

src/CPE/cpename.c

@@ -303,9 +303,8 @@ struct cpe_name *cpe_name_new(const char *cpestr)
 
 			free(data_);
 			free(fields_);
-		}
-		else if (format == CPE_FORMAT_WFN)
-		{
+		} else if (format == CPE_FORMAT_WFN) {
+			/* FIXME: Do something here or remove the branch */
 		}
 	}
 	return cpe;

src/OVAL/probes/SEAP/sexp-value.c

@@ -489,7 +489,7 @@ uintptr_t SEXP_rawval_lblk_copy (uintptr_t lblkp, uint16_t n_skip)
                 /*
                  * copy list items
                  */
-                while (off_n < (1 << cur_sz) && off_o < lb_old->real) {
+                while (off_n < ((uint16_t)1 << cur_sz) && off_o < lb_old->real) {
                         lb_new->memb[off_n].s_valp = SEXP_rawval_incref (lb_old->memb[off_o].s_valp);
                         lb_new->memb[off_n].s_type = lb_old->memb[off_o].s_type;
 #if !defined(NDEBUG) || defined(VALIDATE_SEXP)

src/OVAL/probes/independent/yamlfilecontent_probe.c

@@ -67,16 +67,16 @@ static bool match_regex(const char *pattern, const char *value)
 	return false;
 }
 
-static SEXP_t *yaml_scalar_event_to_sexp(yaml_event_t event)
+static SEXP_t *yaml_scalar_event_to_sexp(yaml_event_t *event)
 {
-	char *tag = (char *) event.data.scalar.tag;
-	char *value = (char *) event.data.scalar.value;
+	char *tag = (char *) event->data.scalar.tag;
+	char *value = (char *) event->data.scalar.value;
 
 	/* nodes lacking an explicit tag are given a non-specific tag:
 	 * “!” for non-plain scalars, and “?” for all other nodes
 	 */
 	if (tag == NULL) {
-		if (event.data.scalar.style != YAML_PLAIN_SCALAR_STYLE) {
+		if (event->data.scalar.style != YAML_PLAIN_SCALAR_STYLE) {
 			tag = "!";
 		} else {
 			tag = "?";
@@ -216,7 +216,7 @@ static int yaml_path_query(const char *filepath, const char *yaml_path_cstr, str
 			}
 		}
 		if (event.type == YAML_SCALAR_EVENT) {
-			SEXP_t *sexp = yaml_scalar_event_to_sexp(event);
+			SEXP_t *sexp = yaml_scalar_event_to_sexp(&event);
 			if (sexp == NULL) {
 				SEXP_t *msg = probe_msg_creatf(OVAL_MESSAGE_LEVEL_ERROR,
 					"Can't convert '%s %s' to SEXP", event.data.scalar.tag,

src/OVAL/probes/unix/gconf_probe.c

@@ -222,6 +222,7 @@ int gconf_probe_main(probe_ctx *ctx, void *probe_arg)
 						collect_item_direct(ctx, gconf_addr, gconf_engine, gconf_key);
 						break;
 					case OVAL_OPERATION_PATTERN_MATCH:
+						/* FIXME: This is a NOOP call */
 						collect_item_regexp(ctx, gconf_addr, gconf_engine, gconf_key);
 						break;
 					default:
@@ -249,6 +250,7 @@ int gconf_probe_main(probe_ctx *ctx, void *probe_arg)
 			collect_item_direct(ctx, NULL, gconf_engine, gconf_key);
 			break;
 		case OVAL_OPERATION_PATTERN_MATCH:
+			/* FIXME: This is a NOOP call */
 			collect_item_regexp(ctx, NULL, gconf_engine, gconf_key);
 			break;
 		default:

src/OVAL/probes/unix/linux/rpminfo_probe.c

@@ -177,7 +177,7 @@ static int get_rpminfo(struct rpminfo_req *req, struct rpminfo_rep **rep, struct
 	regex_t keyid_regex;
 
 	if (regcomp(&keyid_regex, g_keyid_regex_string, REG_EXTENDED) != 0) {
-		dE("regcomp(%s) failed.");
+		dE("regcomp(%s) failed.", g_keyid_regex_string);
 		return -1;
 	}
 

src/OVAL/probes/unix/linux/systemdshared.h

@@ -261,10 +261,10 @@ static char *dbus_value_to_string(DBusMessageIter *iter)
 
 #ifdef DBUS_HAVE_INT64
 			case DBUS_TYPE_INT64:
-				return oscap_sprintf("%lli", value.i32);
+				return oscap_sprintf("%lli", value.i64);
 
 			case DBUS_TYPE_UINT64:
-				return oscap_sprintf("%llu", value.u32);
+				return oscap_sprintf("%llu", value.u64);
 #endif
 
 			case DBUS_TYPE_DOUBLE:

utils/oscap-tool.h

@@ -20,6 +20,9 @@
  *      Maros Barabas <[email protected]>
  */
 
+#pragma once
+#ifndef OSCAP_TOOL_H_
+#define OSCAP_TOOL_H_
 
 /* Standard header files */
 #include <stdio.h>
@@ -224,3 +227,5 @@ getopt_long(int ___argc, char *__getopt_argv_const *___argv,
 	const struct option *__longopts, int *__longind);
 
 #endif
+
+#endif //OSCAP_TOOL_H_