Merge pull request #3382 from candlepin/jhnidek/libdnf_small_fixes

Small fixes of libdnf plugins
candlepin · Mar 6, 2024 · 4ad1403 · 4ad1403
2 parents 9d3f9e9 + 01f65d2
commit 4ad1403
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/src/plugins/libdnf/product-id.c b/src/plugins/libdnf/product-id.c
@@ -21,11 +21,8 @@
 #include <openssl/x509.h>
 #include <openssl/err.h>
 
-#include <json-c/json.h>
-
 #include <stdio.h>
 #include <stdlib.h>
-#include <time.h>
 #include <string.h>
 #include <errno.h>
 #include <zlib.h>
@@ -163,7 +160,7 @@ gchar *strHookId(PluginHookId id) {
     }
 }
 
-RepoProductId *initRepoProductId() {
+RepoProductId *initRepoProductId(void) {
     RepoProductId *repoProductId = (RepoProductId*) malloc(sizeof(RepoProductId));
     repoProductId->repo = NULL;
     repoProductId->productIdPath = NULL;

diff --git a/src/plugins/libdnf/product-id.h b/src/plugins/libdnf/product-id.h
@@ -68,7 +68,7 @@ typedef struct {
     bool isInstalled;
 } RepoProductId;
 
-RepoProductId *initRepoProductId();
+RepoProductId *initRepoProductId(void);
 void freeRepoProductId(RepoProductId *repoProductId);
 void printError(const char *msg, GError *err);
 void getEnabled(const GPtrArray *repos, GPtrArray *enabledRepos);

diff --git a/src/plugins/libdnf/productdb.c b/src/plugins/libdnf/productdb.c
@@ -101,6 +101,7 @@ void readProductDb(ProductDb *productDb, GError **err) {
             if (repoIds == NULL) {
                 *err = g_error_new_literal(quark, 0, error_string);
                 g_free(productId);
+                json_object_put(dbJson);
                 return;
             }
             GSList *repoList = NULL;
@@ -109,6 +110,7 @@ void readProductDb(ProductDb *productDb, GError **err) {
             if (idArray == NULL) {
                 *err = g_error_new_literal(quark, 0, error_string);
                 g_free(productId);
+                json_object_put(dbJson);
                 return;
             }
             int len = array_list_length(idArray);
@@ -119,6 +121,7 @@ void readProductDb(ProductDb *productDb, GError **err) {
                 if (repoId == NULL) {
                     *err = g_error_new_literal(quark, 0, error_string);
                     g_free(productId);
+                    json_object_put(dbJson);
                     return;
                 }
                 repoList = g_slist_prepend(repoList, (gpointer) repoId);

diff --git a/src/plugins/libdnf/test-product-id.c b/src/plugins/libdnf/test-product-id.c
@@ -13,7 +13,6 @@
  * in this software or its documentation.
  */
 
-#include <stdlib.h>
 #include <glib.h>
 #include <stdio.h>
 #include <gio/gio.h>

diff --git a/src/plugins/libdnf/test-productdb.c b/src/plugins/libdnf/test-productdb.c
@@ -14,7 +14,6 @@
  */
 
 #include <glib.h>
-#include <stdio.h>
 #include <gio/gio.h>
 #include <string.h>
 
@@ -180,6 +179,8 @@ void testReadCorruptedFile(dbFixture *fixture, gconstpointer ignored) {
     g_assert_nonnull(err);
     g_clear_error(&err);
     g_assert_cmpint(g_hash_table_size(db->repoMap), ==, 0);
+    g_free(path);
+    g_object_unref(testJsonFile);
 }
 
 void testReadFileWrongData(dbFixture *fixture, gconstpointer ignored) {
@@ -223,6 +224,8 @@ void testReadFileWrongData(dbFixture *fixture, gconstpointer ignored) {
     g_clear_error(&err);
 
     g_io_stream_close((GIOStream*) ioStream, NULL, &err);
+    g_free(path);
+    g_object_unref(testJsonFile);
 }
 
 void testWriteFile(dbFixture *fixture, gconstpointer ignored) {