348ee56 Skip goto usage where possible — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Skip goto usage where possible

Marin Atanasov Nikolov committed 14 years ago

commit 348ee56cc8d13cdc986cba854b6c3f00f56d2582
parent b8d4eb8

2 files changed +2 -5

modified pkg/add.c

@@ -53,8 +53,7 @@ exec_add(int argc, char **argv)

 	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK) {
 		pkg_error_warn("can not open database");
 		retcode = EPKG_FATAL;
 		goto cleanup;
 		return (EX_IOERR);
 	}
 	for (i = 1; i < argc; i++) {

@@ -74,7 +73,6 @@ exec_add(int argc, char **argv)

 		}
 	}
 	cleanup:
 	pkgdb_close(db);
 	return (retcode == EPKG_OK ? EX_OK : 1);

modified pkg/install.c

@@ -40,8 +40,7 @@ exec_install(int argc, char **argv)

 	if (pkgdb_open(&db, PKGDB_REMOTE) != EPKG_OK) {
 		pkg_error_warn("can not open database");
 		retcode = EPKG_FATAL;
 		goto cleanup;
 		return (EX_IOERR);
 	}
 	if (pkg_jobs_new(&jobs, PKG_JOBS_INSTALL, db) != EPKG_OK) {