Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Merge branch 'master' of etoilebsd.net:pkgng
Baptiste Daroussin committed 15 years ago
commit f55f6b1919986be5755fd02954596c17070ac190
parent 7f4f9b3
4 files changed +4 -7
modified libpkg/pkg_file.c
@@ -24,11 +24,11 @@ pkg_file_size(struct pkg_file *file)
int
pkg_file_new(struct pkg_file **file)
{
-
	if ((*file = calloc(1, sizeof(struct pkg_file))))
-
		return (-1);
+
	if ((*file = calloc(1, sizeof(struct pkg_file))) == NULL)
+
		return (EPKG_FATAL);

	(*file)->size = -1;
-
	return (0);
+
	return (EPKG_OK);
}

void
modified libpkg/pkg_manifest.c
@@ -183,7 +183,6 @@ m_parse_dep(struct pkg *pkg, char *buf)
	origin = buf_ptr;

	buf_ptr += next + 1;
-
	next = strlen(buf_ptr);

	version = buf_ptr;

modified libpkg/pkg_util.c
@@ -157,7 +157,6 @@ format_exec_cmd(char **dest, const char *in, const char *prefix, const char *pli
	struct sbuf *buf = sbuf_new_auto();
	char path[MAXPATHLEN];
	char *cp;
-
	int len = 0;

	while (in[0] != '\0') {
		if (in[0] == '%') {
@@ -198,7 +197,6 @@ format_exec_cmd(char **dest, const char *in, const char *prefix, const char *pli

	sbuf_finish(buf);
	*dest = strdup(sbuf_data(buf));
-
	len = sbuf_len(buf);
	sbuf_free(buf);
	
	return (0);
modified pkg/repo.c
@@ -9,7 +9,7 @@
void
usage_repo(void)
{
-
	fprintf(stderr, "repo ...");
+
	fprintf(stderr, "repo <repo-path>\n");
}

static void