Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › da19e1f
Update my code changes to be more consistent with style
Bryan Drewery committed 13 years ago
commit da19e1fc02abe3ca3488309f0b2f028eda2c1b26
parent 63efb21
3 files changed +13 -26
modified libpkg/pkgdb.c
@@ -858,9 +858,8 @@ pkgdb_get_pattern_query(const char *pattern, match_t match)
	char *checkorigin = NULL;

	const char *comp = NULL;
- 
	if (pattern != NULL) {
+ 
	if (pattern != NULL)

		checkorigin = strchr(pattern, '/');
- 
	}



	switch (match) {

	case MATCH_ALL:
@@ -2292,9 +2291,8 @@ pkgdb_query_newpkgversion(struct pkgdb *db, const char *repo)
	assert(db != NULL);

	assert(db->type == PKGDB_REMOTE);
- 
	if ((reponame = pkgdb_get_reponame(db, repo)) == NULL) {
+ 
	if ((reponame = pkgdb_get_reponame(db, repo)) == NULL)

		return (NULL);
- 
	}



	sql = sbuf_new_auto();

	sbuf_printf(sql, main_sql, reponame);
@@ -2374,9 +2372,8 @@ pkgdb_query_installs(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs, c
	assert(db != NULL);

	assert(db->type == PKGDB_REMOTE);
- 
	if ((reponame = pkgdb_get_reponame(db, repo)) == NULL) {
+ 
	if ((reponame = pkgdb_get_reponame(db, repo)) == NULL)

		return (NULL);
- 
	}



	sql = sbuf_new_auto();

	sbuf_printf(sql, main_sql, reponame);
@@ -2518,9 +2515,8 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)


	const char weight_sql[] = "UPDATE pkgjobs set weight=(select count(*) from '%s'.deps as d where d.origin=pkgjobs.origin)";
- 
	if ((reponame = pkgdb_get_reponame(db, repo)) == NULL) {
+ 
	if ((reponame = pkgdb_get_reponame(db, repo)) == NULL)

		return (NULL);
- 
	}



	sql = sbuf_new_auto();

	create_temporary_pkgjobs(db->sqlite);
@@ -2587,9 +2583,8 @@ pkgdb_query_downgrades(struct pkgdb *db, const char *repo)
		"WHERE l.origin = r.origin "

		"AND PKGGT(l.version, r.version)";
- 
	if ((reponame = pkgdb_get_reponame(db, repo)) == NULL) {
+ 
	if ((reponame = pkgdb_get_reponame(db, repo)) == NULL)

		return (NULL);
- 
	}



	sql = sbuf_new_auto();

	sbuf_printf(sql, finalsql, reponame, reponame);
@@ -2735,15 +2730,13 @@ pkgdb_rquery(struct pkgdb *db, const char *pattern, match_t match, const char *r
	assert(db != NULL);

	assert(match == MATCH_ALL || (pattern != NULL && pattern[0] != '\0'));
- 
	if ((reponame = pkgdb_get_reponame(db, repo)) == NULL) {
+ 
	if ((reponame = pkgdb_get_reponame(db, repo)) == NULL)

		return (NULL);
- 
	}



	sql = sbuf_new_auto();

	comp = pkgdb_get_pattern_query(pattern, match);
- 
	if (comp && comp[0]) {
+ 
	if (comp && comp[0])

		strlcat(basesql, comp, sizeof(basesql));
- 
	}



	pkg_config_bool(PKG_CONFIG_MULTIREPOS, &multirepos_enabled);
@@ -2756,9 +2749,8 @@ pkgdb_rquery(struct pkgdb *db, const char *pattern, match_t match, const char *r
			sbuf_delete(sql);

			return (NULL);

		}
- 
	} else {
+ 
	} else

		sbuf_printf(sql, basesql, reponame, reponame);
- 
	}



	sbuf_cat(sql, " ORDER BY name;");

	sbuf_finish(sql);
@@ -3148,9 +3140,8 @@ pkgdb_query_fetch(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs, cons
	assert(db != NULL);

	assert(db->type == PKGDB_REMOTE);
- 
	if ((reponame = pkgdb_get_reponame(db, repo)) == NULL) {
+ 
	if ((reponame = pkgdb_get_reponame(db, repo)) == NULL)

		return (NULL);
- 
	}



	sql = sbuf_new_auto();

	sbuf_printf(sql, main_sql, reponame);
modified pkg/check.c
@@ -321,21 +321,18 @@ exec_check(int argc, char **argv)
			pkg_get(pkg, PKG_NAME, &pkgname);

			/* check for missing dependencies */

			if (dcheck) {
- 
				if (verbose) {
+ 
				if (verbose)

					printf("Checking dependencies: %s\n", pkgname);
- 
				}

				nbpkgs += check_deps(db, pkg, &dh);

			}

			if (checksums) {
- 
				if (verbose) {
+ 
				if (verbose)

					printf("Checking checksums: %s\n", pkgname);
- 
				}

				pkg_test_filesum(pkg);

			}

			if (recomputeflatsize) {
- 
				if (verbose) {
+ 
				if (verbose)

					printf("Recomputing size: %s\n", pkgname);
- 
				}

				newflatsize = pkg_recompute_flatsize(pkg);

				pkg_get(pkg, PKG_FLATSIZE, &flatsize);

				if (newflatsize != flatsize)
modified pkg/set.c
@@ -174,9 +174,8 @@ exec_set(int argc, char **argv)
						if (!pkg_yes)

							pkg_yes = query_yesno("%s-%s: change %s dependency to %s? [y/N]: ", name, version, oldorigin, neworigin);

						if (pkg_yes) {
- 
							if (pkgdb_set(db, pkg, PKG_DEP_ORIGIN, oldorigin, neworigin) != EPKG_OK) {
+ 
							if (pkgdb_set(db, pkg, PKG_DEP_ORIGIN, oldorigin, neworigin) != EPKG_OK)

								return (EPKG_FATAL);
- 
							}

						}

					}

				}