From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 2 Jun 2021 14:37:42 +0000 (+0000)
Subject: parser: Use default stdout log capturer
X-Git-Tag: 0.9.28~1285^2~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ead9531fb607a94c84d6af985b65ccd10c14f5b4;p=pakfire.git

parser: Use default stdout log capturer

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/parser.c b/src/libpakfire/parser.c
index efd6b6120..bd7304b6c 100644
--- a/src/libpakfire/parser.c
+++ b/src/libpakfire/parser.c
@@ -372,16 +372,6 @@ PAKFIRE_EXPORT int pakfire_parser_append(PakfireParser parser,
 	return r;
 }
 
-static int pakfire_parser_command_logger(Pakfire pakfire, void* data,
-		int priority, const char* line, size_t length) {
-	char** output = (char**)data;
-
-	// Append output
-	asprintf(output, "%s%s", (output && *output) ? *output : "", line);
-
-	return 0;
-}
-
 static int pakfire_parser_expand_commands(PakfireParser parser, char** buffer) {
 	int r = 0;
 	PCRE2_UCHAR* command = NULL;
@@ -426,7 +416,7 @@ static int pakfire_parser_expand_commands(PakfireParser parser, char** buffer) {
 
 		// Execute the command inside the Pakfire environment
 		r = pakfire_execute(parser->pakfire, argv, NULL, 0,
-				pakfire_parser_command_logger, &output);
+				pakfire_execute_capture_stdout, &output);
 		if (r) {
 			// Just log this and continue
 			DEBUG(parser->pakfire, "Command '%s' failed with return code %d\n", command, r);