Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › cbdeb63
Remove useless tests for NULL pointers in pkg/*
Marin Atanasov Nikolov committed 14 years ago
commit cbdeb63872266e9156ddca6b816ddc387eaad911
parent 4bd053f
6 files changed +16 -25
modified libpkg/pkg_jobs.c
@@ -29,6 +29,9 @@ pkg_jobs_free(struct pkg_jobs *j)
{

	struct pkg *p;
+ 
	if (j == NULL)
+ 
		return;
+ 


	while (!STAILQ_EMPTY(&j->jobs)) {

		p = STAILQ_FIRST(&j->jobs);

		STAILQ_REMOVE_HEAD(&j->jobs, next);
modified pkg/add.c
@@ -95,10 +95,9 @@ add_from_repo(const char *name)
		pkg_error_warn("can not install");



	cleanup:
- 
	if (db != NULL)
- 
		pkgdb_close(db);
- 
	if (jobs != NULL)
- 
		pkg_jobs_free(jobs);
+ 
	pkgdb_close(db);
+ 
	pkg_jobs_free(jobs);
+ 


	return (EPKG_OK);

}
@@ -126,10 +125,8 @@ add_from_file(const char *file)
		printf("%s", message);



	cleanup:
- 
	if (db != NULL)
- 
		pkgdb_close(db);
- 
	if (pkg != NULL)
- 
		pkg_free(pkg);
+ 
	pkgdb_close(db);
+ 
	pkg_free(pkg);



	return (retcode);

}
modified pkg/autoremove.c
@@ -107,9 +107,7 @@ exec_autoremove(int argc, char **argv)


	cleanup:

	pkg_free(pkg);
-
- 
	if (db != NULL)
- 
		pkgdb_close(db);
+ 
	pkgdb_close(db);



	return (retcode);

}
modified pkg/create.c
@@ -72,12 +72,10 @@ cleanup:
		retcode++;

	}
- 
	if (pkg != NULL)
- 
		pkg_free(pkg);
- 
	if (it != NULL)
- 
		pkgdb_it_free(it);
- 
	if (db != NULL)
- 
		pkgdb_close(db);
+ 
	pkg_free(pkg);
+ 
	pkgdb_it_free(it);
+ 
	pkgdb_close(db);
+ 


	return retcode;

}
modified pkg/search.c
@@ -88,11 +88,8 @@ exec_search(int argc, char **argv)
	}



	cleanup:
- 
	if (it != NULL)
- 
		pkgdb_it_free(it);
-
- 
	if (db != NULL)
- 
		pkgdb_close(db);
+ 
	pkgdb_it_free(it);
+ 
	pkgdb_close(db);



	return (retcode);
modified pkg/upgrade.c
@@ -92,9 +92,7 @@ exec_upgrade(int argc, char **argv)




	cleanup:
-
- 
	if (db != NULL)
- 
		pkgdb_close(db);
+ 
	pkgdb_close(db);



	return (retcode);

}