const

src/transaction.c

@@ -187,8 +187,8 @@ int slapt_transaction_t_run(const slapt_config_t *global_config, slapt_transacti
 
         uint32_t len = 0;
         slapt_vector_t_foreach (const slapt_pkg_upgrade_t *, upgrade, trxn->upgrade_pkgs) {
-            slapt_pkg_t *u = upgrade->upgrade;
-            slapt_pkg_t *p = upgrade->installed;
+            const slapt_pkg_t *u = upgrade->upgrade;
+            const slapt_pkg_t *p = upgrade->installed;
 
             const int line_len = len + strlen(u->name) + 1;
             const size_t existing_file_size = slapt_get_pkg_file_size(global_config, u) / 1024;
@@ -215,8 +215,8 @@ int slapt_transaction_t_run(const slapt_config_t *global_config, slapt_transacti
 
         uint32_t len = 0;
         slapt_vector_t_foreach (const slapt_pkg_upgrade_t *, reinstall_upgrade, trxn->reinstall_pkgs) {
-            slapt_pkg_t *u = reinstall_upgrade->upgrade;
-            slapt_pkg_t *p = reinstall_upgrade->installed;
+            const slapt_pkg_t *u = reinstall_upgrade->upgrade;
+            const slapt_pkg_t *p = reinstall_upgrade->installed;
 
             const int line_len = len + strlen(u->name) + 1;
             const size_t existing_file_size = slapt_get_pkg_file_size(global_config, u) / 1024;
@@ -575,18 +575,11 @@ void slapt_transaction_t_free(slapt_transaction_t *trxn)
 
 slapt_transaction_t *slapt_transaction_t_remove(slapt_transaction_t *trxn, const slapt_pkg_t *pkg)
 {
-    slapt_transaction_t *new_trxn = NULL;
 
     if (!slapt_transaction_t_search_by_pkg(trxn, pkg))
         return trxn;
 
-    /* since this is a pointer, slapt_malloc before calling init */
-    new_trxn = slapt_malloc(sizeof *new_trxn);
-    new_trxn->install_pkgs = slapt_malloc(sizeof *new_trxn->install_pkgs);
-    new_trxn->remove_pkgs = slapt_malloc(sizeof *new_trxn->remove_pkgs);
-    new_trxn->upgrade_pkgs = slapt_malloc(sizeof *new_trxn->upgrade_pkgs);
-    new_trxn->exclude_pkgs = slapt_malloc(sizeof *new_trxn->exclude_pkgs);
-    new_trxn = slapt_transaction_t_init();
+    slapt_transaction_t *new_trxn = slapt_transaction_t_init();
 
     slapt_vector_t_foreach (const slapt_pkg_t *, installed_pkg, trxn->install_pkgs) {
         if (strcmp(pkg->name, installed_pkg->name) == 0 &&
@@ -631,6 +624,7 @@ slapt_transaction_t *slapt_transaction_t_remove(slapt_transaction_t *trxn, const
         slapt_transaction_t_add_exclude(new_trxn, exclude_pkg);
     }
 
+    slapt_transaction_t_free(trxn);
     return new_trxn;
 }
 
@@ -744,13 +738,13 @@ bool slapt_transaction_t_search_by_pkg(const slapt_transaction_t *trxn, const sl
     }
 
     slapt_vector_t_foreach (const slapt_pkg_upgrade_t *, upgrade, trxn->upgrade_pkgs) {
-        slapt_pkg_t *p = upgrade->upgrade;
+        const slapt_pkg_t *p = upgrade->upgrade;
         if ((strcmp(pkg->name, p->name) == 0) && (strcmp(pkg->version, p->version) == 0))
             return true;
     }
 
     slapt_vector_t_foreach (const slapt_pkg_upgrade_t *, reinstall, trxn->reinstall_pkgs) {
-        slapt_pkg_t *p = reinstall->upgrade;
+        const slapt_pkg_t *p = reinstall->upgrade;
         if ((strcmp(pkg->name, p->name) == 0) && (strcmp(pkg->version, p->version) == 0))
             return true;
     }

t/test_common.c

@@ -15,7 +15,7 @@ END_TEST
 START_TEST(test_regex)
 {
     slapt_regex_t *regex = slapt_regex_t_init("^[a-z]+$");
-    slapt_regex_t *invalid_regex = slapt_regex_t_init("^[-");
+    const slapt_regex_t *invalid_regex = slapt_regex_t_init("^[-");
 
     ck_assert(regex != NULL);
     ck_assert(invalid_regex == NULL);
@@ -69,8 +69,8 @@ START_TEST(test_slapt_str_replace_chr)
 END_TEST
 
 int test_cmp_via_strcmp(const void *a, const void *b) {
-    char *sa = *(char **)a;
-    char *sb = *(char **)b;
+    const char *sa = *(char **)a;
+    const char *sb = *(char **)b;
     return strcmp(sa, sb);
 }
 START_TEST(test_slapt_vector_t)

t/test_curl.c

@@ -8,12 +8,12 @@ START_TEST(test_slapt_get_mirror_data_from_source)
     FILE *f = NULL;
     const char *err = NULL;
     slapt_config_t *rc = slapt_config_t_read("./data/rc1");
-    slapt_source_t *src = rc->sources->items[0];
+    const slapt_source_t *src = rc->sources->items[0];
     const char *url = src->url;
-    char *packages = "PACKAGES.TXT";
-    char *packages_gz = "PACKAGES.TXT.gz";
-    char *checksums = "CHECKSUMS.md5";
-    char *checksums_gz = "CHECKSUMS.md5.gz";
+    const char *packages = "PACKAGES.TXT";
+    const char *packages_gz = "PACKAGES.TXT.gz";
+    const char *checksums = "CHECKSUMS.md5";
+    const char *checksums_gz = "CHECKSUMS.md5.gz";
     rc->progress_cb = _progress_cb; /* silence */
 
     f = slapt_open_file("data/PACKAGES.TXT", "w+b");

t/test_packages.c

@@ -575,12 +575,12 @@ START_TEST(test_slapt_dependency_t)
     ck_assert(alt_dep->op == DEP_OP_OR);
 
     /* first alternative */
-    slapt_dependency_t *first = alt_dep->alternatives->items[0];
+    const slapt_dependency_t *first = alt_dep->alternatives->items[0];
     ck_assert(first->op == DEP_OP_ANY);
     ck_assert(strcmp(first->name, "foo") == 0);
     ck_assert(first->version == NULL);
     /* second alternative */
-    slapt_dependency_t *second = alt_dep->alternatives->items[1];
+    const slapt_dependency_t *second = alt_dep->alternatives->items[1];
     ck_assert(second->op == DEP_OP_GTE);
     ck_assert(strcmp(second->name, "bar") == 0);
     ck_assert(strcmp(second->version, "1.0") == 0);

t/test_transaction.c

@@ -82,7 +82,7 @@ START_TEST(test_transaction_dependencies)
     in the transaction
   void slapt_transaction_t_suggestions(slapt_transaction_t *trxn);
   */
-    slapt_pkg_t *p = slapt_get_newest_pkg(avail, "scim");
+    const slapt_pkg_t *p = slapt_get_newest_pkg(avail, "scim");
     slapt_pkg_t *installed_p = slapt_get_newest_pkg(installed, "scim");
     (void)installed_p;
 
@@ -91,6 +91,7 @@ START_TEST(test_transaction_dependencies)
         slapt_transaction_t_add_install(t, conflicts->items[0]);
         slapt_transaction_t_add_dependencies(rc, t, avail, installed, conflicts->items[0]);
     }
+    slapt_vector_t_free(conflicts);
 
     slapt_transaction_t_add_dependencies(rc, t, avail, installed, p);
     slapt_transaction_t_add_install(t, p);