Fix compiler warnings (#437)

* Fix compiler warnings

* auditctl: remove redundant assignment to retval in opt_trim

Author: Cropi

lib/libaudit.c

@@ -789,7 +789,7 @@ int audit_add_watch_dir(int type, struct audit_rule_data **rulep,
 			const char *path)
 {
 	size_t len = strlen(path);
-	struct audit_rule_data *rule = *rulep;
+	struct audit_rule_data *rule = *rulep, *tmp;
 
 	if (rule && rule->field_count) {
 		audit_msg(LOG_ERR, "Rule is not empty");
@@ -800,12 +800,16 @@ int audit_add_watch_dir(int type, struct audit_rule_data **rulep,
 		return -1;
 	}
 
-	*rulep = realloc(rule, len + sizeof(*rule));
-	if (*rulep == NULL) {
+	// Use a temporary pointer to prevent memory leaks
+	tmp = realloc(rule, len + sizeof(*rule));
+	if (tmp == NULL) {
 		free(rule);
+		*rulep = NULL;
 		audit_msg(LOG_ERR, "Cannot realloc memory!");
 		return -1;
 	}
+
+	*rulep = tmp;
 	rule = *rulep;
 	memset(rule, 0, len + sizeof(*rule));
 
@@ -830,6 +834,7 @@ int audit_add_watch_dir(int type, struct audit_rule_data **rulep,
 	return  0;
 }
 
+
 int audit_add_rule_data(int fd, struct audit_rule_data *rule,
                         int flags, int action)
 {
@@ -1621,7 +1626,7 @@ int audit_rule_fieldpair_data(struct audit_rule_data **rulep, const char *pair,
 	int        field;
 	int        vlen;
 	int        offset;
-	struct audit_rule_data *rule = *rulep;
+	struct audit_rule_data *rule = *rulep, *tmp;
 
 	if (f == NULL)
 		return -EAU_FILTERMISSING;
@@ -1834,14 +1839,14 @@ int audit_rule_fieldpair_data(struct audit_rule_data **rulep, const char *pair,
 			rule->values[rule->field_count] = vlen;
 			offset = rule->buflen;
 			rule->buflen += vlen;
-			*rulep = realloc(rule, sizeof(*rule) + rule->buflen);
-			if (*rulep == NULL) {
+			tmp = realloc(rule, sizeof(*rule) + rule->buflen);
+			if (tmp == NULL) {
 				free(rule);
 				audit_msg(LOG_ERR, "Cannot realloc memory!");
 				return -3;
-			} else {
-				rule = *rulep;
 			}
+			*rulep = tmp;
+			rule = tmp;
 			strncpy(&rule->buf[offset], v, vlen);
 
 			break;

src/auditctl.c

@@ -642,7 +642,6 @@ static int opt_continue(opt_handler_params_t *args)
 
 static int opt_status(opt_handler_params_t *args)
 {
-	int retval = args->retval;
 	if (*(args->count) > 3) {
 		audit_msg(LOG_ERR,
 			"Too many options for status command");
@@ -1189,15 +1188,14 @@ static int opt_mount(opt_handler_params_t *args)
 
 static int opt_trim(opt_handler_params_t *args)
 {
-
-	int retval = args->retval;
-	retval = audit_trim_subtrees(fd);
+	int retval = audit_trim_subtrees(fd);
 	if (retval <= 0)
 		retval = OPT_ERROR_NO_REPLY;
 	else {
 		args->finish = 1;
 		return OPT_SUCCESS_NO_REPLY; // success - no reply needed
 	}
+	return retval;
 }
 
 static int opt_version(opt_handler_params_t *args)