Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Use the LIST_FREE macro where possible
Baptiste Daroussin committed 13 years ago
commit 6d59edeffcde090d837de1562a9c5f7700e3f7fe
parent 8b50aac
3 files changed +15 -16
modified libpkg/pkg_delete.c
@@ -124,6 +124,7 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags)
		pkg_emit_deinstall_finished(pkg);

	pkg_get(pkg, PKG_ORIGIN, &origin);
+

	return (pkgdb_unregister_pkg(db, origin));
}

modified libpkg/pkg_jobs.c
@@ -94,11 +94,7 @@ pkg_jobs_free(struct pkg_jobs *j)
		pkgdb_unlock(j->db);

	HASH_FREE(j->jobs, pkg, pkg_free);
-
	while (!STAILQ_EMPTY(&j->patterns)) {
-
		jp = STAILQ_FIRST(&j->patterns);
-
		STAILQ_REMOVE_HEAD(&j->patterns, next);
-
		free(jp);
-
	}
+
	LIST_FREE(&j->patterns, jp, free);

	free(j);
}
modified libpkg/plugins.c
@@ -85,22 +85,24 @@ pkg_plugin_hook_free(struct pkg_plugin *p)
	return (EPKG_OK);
}

-
static int
-
pkg_plugin_free(void)
+
static void
+
plug_free(struct pkg_plugin *p)
{
-
	struct pkg_plugin *p = NULL;
	unsigned int i;

-
        while (!STAILQ_EMPTY(&ph)) {
-
                p = STAILQ_FIRST(&ph);
-
                STAILQ_REMOVE_HEAD(&ph, next);
+
	for (i = 0; i < PLUGIN_NUMFIELDS; i++)
+
		sbuf_delete(p->fields[i]);
+

+
	pkg_plugin_hook_free(p);
+
	free(p);
+
}

-
		for (i = 0; i < PLUGIN_NUMFIELDS; i++)
-
			sbuf_delete(p->fields[i]);
+
static int
+
pkg_plugin_free(void)
+
{
+
	struct pkg_plugin *p = NULL;

-
		pkg_plugin_hook_free(p);
-
		free(p);
-
        }
+
	LIST_FREE(&ph, p, plug_free);

	return (EPKG_OK);
}