2cefd7e Remove excess whitespace — HardenedBSD-pkg

HardenedBSD Package Manager

Remove excess whitespace

Bryan Drewery committed 13 years ago

commit 2cefd7e788df50a476f4d18f69b6b800e9e72417
parent c2bc8e699cd425a41cfcfec536fc055ac1c109aa

2 files changed +14 -14

modified libpkg/pkgdb.c

@@ -3299,7 +3299,7 @@ int

 pkgdb_lock(struct pkgdb *db)
 {
 	assert(db != NULL);
 	return sql_exec(db->sqlite, "PRAGMA main.locking_mode=EXCLUSIVE;BEGIN IMMEDIATE;COMMIT;");
 }

@@ -3307,7 +3307,7 @@ int

 pkgdb_unlock(struct pkgdb *db)
 {
 	assert(db != NULL);
 	return sql_exec(db->sqlite, "PRAGMA main.locking_mode=NORMAL;BEGIN IMMEDIATE;COMMIT;");
 }

@@ -3321,7 +3321,7 @@ pkgdb_stats(struct pkgdb *db, pkg_stats_t type)

 	assert(db != NULL);
 	sql = sbuf_new_auto();
 	switch(type) {
 	case PKG_STATS_LOCAL_COUNT:
 		sbuf_printf(sql, "SELECT COUNT(id) FROM main.packages;");

@@ -3343,13 +3343,13 @@ pkgdb_stats(struct pkgdb *db, pkg_stats_t type)

 		break;
 	case PKG_STATS_REMOTE_COUNT:
 		sbuf_printf(sql, "SELECT COUNT(c) FROM ");
 		/* open parentheses for the compound statement */
 		sbuf_printf(sql, "(");
 		/* execute on all databases */
 		sql_on_all_attached_db(db->sqlite, sql, "SELECT origin AS c FROM '%1$s'.packages", " UNION ALL ");
 		/* close parentheses for the compound statement */
 		sbuf_printf(sql, ");");
 		break;

@@ -3367,10 +3367,10 @@ pkgdb_stats(struct pkgdb *db, pkg_stats_t type)

 		break;
 	case PKG_STATS_REMOTE_REPOS:
 		sbuf_printf(sql, "SELECT COUNT(c) FROM ");
 		/* open parentheses for the compound statement */
 		sbuf_printf(sql, "(");
 		/* execute on all databases */
 		sql_on_all_attached_db(db->sqlite, sql, "SELECT '%1$s' AS c", " UNION ALL ");

@@ -3383,7 +3383,7 @@ pkgdb_stats(struct pkgdb *db, pkg_stats_t type)

 		ERROR_SQLITE(db->sqlite);
 		return (-1);
 	}
 	while (sqlite3_step(stmt) != SQLITE_DONE) {
 		stats = sqlite3_column_int64(stmt, 0);
 	}

modified pkg/stats.c

@@ -62,7 +62,7 @@ exec_stats(int argc, char **argv)

         }
         argc -= optind;
         argv += optind;
 	if (argc > 2) {
 		usage_stats();
 		return (EX_USAGE);

@@ -71,9 +71,9 @@ exec_stats(int argc, char **argv)

 	if (pkgdb_open(&db, PKGDB_REMOTE) != EPKG_OK) {
 		return (EX_IOERR);
 	}
 	printf("Local package database:\n");
        	printf("\tInstalled packages: %" PRId64 "\n", pkgdb_stats(db, PKG_STATS_LOCAL_COUNT));
 	printf("\tInstalled packages: %" PRId64 "\n", pkgdb_stats(db, PKG_STATS_LOCAL_COUNT));
 	flatsize = pkgdb_stats(db, PKG_STATS_LOCAL_SIZE);
 	humanize_number(size, sizeof(flatsize), flatsize, "B", HN_AUTOSCALE, 0);

@@ -87,8 +87,8 @@ exec_stats(int argc, char **argv)

 	flatsize = pkgdb_stats(db, PKG_STATS_REMOTE_SIZE);
 	humanize_number(size, sizeof(flatsize), flatsize, "B", HN_AUTOSCALE, 0);
 	printf("\tTotal size of packages: %s\n", size);
 	pkgdb_close(db);
 	return (retcode);
 }