Improve matching of allocator with its free

Data allocated with glib should be freed with g_free.

10 files changed, 21 insertions, 22 deletions

diff --git a/src/createrepo_c.c b/src/createrepo_c.c
index 80a6f73..5b4ff8e 100644
--- a/src/createrepo_c.c
+++ b/src/createrepo_c.c
@@ -910,7 +910,7 @@ main(int argc, char **argv)
                            (tmp_err ? tmp_err->message : "Unknown error"));
                 g_clear_error(&tmp_err);
                 free(moduleindex_str);
-                free(modules_metadata_path);
+                g_free(modules_metadata_path);
                 g_clear_pointer(&merger, g_object_unref);
                 exit(EXIT_FAILURE);
             }
@@ -920,7 +920,7 @@ main(int argc, char **argv)
             if (tmp_err) {
                 g_critical("%s: Error while closing: : %s", __func__, tmp_err->message);
                 g_clear_error(&tmp_err);
-                free(modules_metadata_path);
+                g_free(modules_metadata_path);
                 g_clear_pointer(&merger, g_object_unref);
                 exit(EXIT_FAILURE);
             }
diff --git a/src/deltarpms.c b/src/deltarpms.c
index c17e1ee..ab0a28a 100644
--- a/src/deltarpms.c
+++ b/src/deltarpms.c
@@ -71,7 +71,7 @@ cr_drpm_create(cr_DeltaTargetPackage *old,
     if (ret != DRPM_ERR_OK) {
         g_set_error(err, ERR_DOMAIN, CRE_DELTARPM,
                     "Deltarpm cannot make %s (%d) from old: %s and new: %s", drpmpath, ret, old->path, new->path);
-        free(drpmpath);
+        g_free(drpmpath);
         drpm_make_options_destroy(&opts);
         return NULL;
     }
diff --git a/src/dumper_thread.c b/src/dumper_thread.c
index 0a0da96..9c0b925 100644
--- a/src/dumper_thread.c
+++ b/src/dumper_thread.c
@@ -222,7 +222,6 @@ get_checksum(const char *filename,
 
     if (cachedir) {
         // Prepare cache fn
-        char *key;
         cr_ChecksumCtx *ctx = cr_checksum_new(type, err);
         if (!ctx) return NULL;
 
@@ -233,14 +232,14 @@ get_checksum(const char *filename,
         if (pkg->hdrid)
             cr_checksum_update(ctx, pkg->hdrid, strlen(pkg->hdrid), NULL);
 
-        key = cr_checksum_final(ctx, err);
+        gchar *key = cr_checksum_final(ctx, err);
         if (!key) return NULL;
 
         cachefn = g_strdup_printf("%s%s-%s-%"G_GINT64_FORMAT"-%"G_GINT64_FORMAT,
                                   cachedir,
                                   cr_get_filename(pkg->location_href),
                                   key, pkg->size_installed, pkg->time_file);
-        free(key);
+        g_free(key);
 
         // Try to load checksum
         FILE *f = fopen(cachefn, "r");
diff --git a/src/misc.c b/src/misc.c
index 4c1ff2c..cb8ee3c 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1612,7 +1612,7 @@ cr_get_dict_file(const gchar *dir, const gchar *file)
     free(dict_file);
     if (!g_file_test(full_path, G_FILE_TEST_EXISTS)) {
         g_warning("%s: Zchunk dict %s doesn't exist", __func__, full_path);
-        free(full_path);
+        g_free(full_path);
         return NULL;
     }
     return full_path;
diff --git a/src/parsepkg.c b/src/parsepkg.c
index f6038bd..ac40ca3 100644
--- a/src/parsepkg.c
+++ b/src/parsepkg.c
@@ -190,14 +190,14 @@ cr_package_from_rpm(const char *filename,
     }
 
     // Compute checksum
-    char *checksum = cr_checksum_file(filename, checksum_type, &tmp_err);
+    gchar *checksum = cr_checksum_file(filename, checksum_type, &tmp_err);
     if (!checksum) {
         g_propagate_prefixed_error(err, tmp_err,
                                    "Error while checksum calculation: ");
         goto errexit;
     }
     pkg->pkgId = cr_safe_string_chunk_insert(pkg->chunk, checksum);
-    free(checksum);
+    g_free(checksum);
 
     // Get header range
     struct cr_HeaderRangeStruct hdr_r = cr_get_header_byte_range(filename,
diff --git a/src/python/package-py.c b/src/python/package-py.c
index 049d8b9..4d455d8 100644
--- a/src/python/package-py.c
+++ b/src/python/package-py.c
@@ -164,9 +164,9 @@ package_str(_PackageObject *self)
     if (check_PackageStatus(self))
         return NULL;
     if (self->package) {
-        char *nevra = cr_package_nvra(self->package);
+        gchar *nevra = cr_package_nvra(self->package);
         ret = PyUnicode_FromString(nevra);
-        free(nevra);
+        g_free(nevra);
     } else {
         ret = PyUnicode_FromString("-");
     }
@@ -185,9 +185,9 @@ nvra(_PackageObject *self, G_GNUC_UNUSED void *nothing)
     PyObject *pystr;
     if (check_PackageStatus(self))
         return NULL;
-    char *nvra = cr_package_nvra(self->package);
+    gchar *nvra = cr_package_nvra(self->package);
     pystr = PyUnicodeOrNone_FromString(nvra);
-    free(nvra);
+    g_free(nvra);
     return pystr;
 }
 
@@ -201,9 +201,9 @@ nevra(_PackageObject *self, G_GNUC_UNUSED void *nothing)
     PyObject *pystr;
     if (check_PackageStatus(self))
         return NULL;
-    char *nevra = cr_package_nevra(self->package);
+    gchar *nevra = cr_package_nevra(self->package);
     pystr = PyUnicodeOrNone_FromString(nevra);
-    free(nevra);
+    g_free(nevra);
     return pystr;
 }
 
diff --git a/src/xml_parser.c b/src/xml_parser.c
index ede77e5..05bcde7 100644
--- a/src/xml_parser.c
+++ b/src/xml_parser.c
@@ -90,7 +90,7 @@ cr_xml_parser_warning(cr_ParserData *pd,
 {
     int ret;
     va_list args;
-    char *warn;
+    gchar *warn;
     GError *tmp_err;
 
     assert(pd);
diff --git a/src/xml_parser_filelists.c b/src/xml_parser_filelists.c
index ae810ae..33a2058 100644
--- a/src/xml_parser_filelists.c
+++ b/src/xml_parser_filelists.c
@@ -400,9 +400,9 @@ cr_xml_parse_filelists_snippet(const char *xml_string,
                                void *warningcb_data,
                                GError **err)
 {
-    char* wrapped_xml_string = g_strconcat("<filelists>", xml_string, "</filelists>", NULL);
+    gchar* wrapped_xml_string = g_strconcat("<filelists>", xml_string, "</filelists>", NULL);
     int ret = cr_xml_parse_filelists_internal(wrapped_xml_string, newpkgcb, newpkgcb_data, pkgcb, pkgcb_data,
                                               warningcb, warningcb_data, &cr_xml_parser_generic_from_string, err);
-    free(wrapped_xml_string);
+    g_free(wrapped_xml_string);
     return ret;
 }
diff --git a/src/xml_parser_other.c b/src/xml_parser_other.c
index ea835cc..a57382a 100644
--- a/src/xml_parser_other.c
+++ b/src/xml_parser_other.c
@@ -394,9 +394,9 @@ cr_xml_parse_other_snippet(const char *xml_string,
                            void *warningcb_data,
                            GError **err)
 {
-    char* wrapped_xml_string = g_strconcat("<otherdata>", xml_string, "</otherdata>", NULL);
+    gchar* wrapped_xml_string = g_strconcat("<otherdata>", xml_string, "</otherdata>", NULL);
     int ret = cr_xml_parse_other_internal(wrapped_xml_string, newpkgcb, newpkgcb_data, pkgcb, pkgcb_data,
                                           warningcb, warningcb_data, &cr_xml_parser_generic_from_string, err);
-    free(wrapped_xml_string);
+    g_free(wrapped_xml_string);
     return ret;
 }
diff --git a/src/xml_parser_primary.c b/src/xml_parser_primary.c
index 9d1a7ff..d3d3f5d 100644
--- a/src/xml_parser_primary.c
+++ b/src/xml_parser_primary.c
@@ -780,9 +780,9 @@ cr_xml_parse_primary_snippet(const char *xml_string,
                              int do_files,
                              GError **err)
 {
-    char* wrapped_xml_string = g_strconcat("<metadata>", xml_string, "</metadata>", NULL);
+    gchar* wrapped_xml_string = g_strconcat("<metadata>", xml_string, "</metadata>", NULL);
     int ret =  cr_xml_parse_primary_internal(wrapped_xml_string, newpkgcb, newpkgcb_data, pkgcb, pkgcb_data,
                                              warningcb, warningcb_data, do_files, &cr_xml_parser_generic_from_string, err);
-    free(wrapped_xml_string);
+    g_free(wrapped_xml_string);
     return ret;
 }