Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Remove useless bufferize string
Baptiste Daroussin committed 5 years ago
commit 9edfc37a3db6927f749b3301733a2d6a65220d78
parent 43d9ef4
1 file changed +8 -14
modified libpkg/pkgdb.c
@@ -3088,20 +3088,18 @@ pkgdb_stats(struct pkgdb *db, pkg_stats_t type)
{
	sqlite3_stmt	*stmt = NULL;
	int64_t		 stats = 0;
-
	UT_string	*sql = NULL;
+
	const char *sql = NULL;
	int		 ret;
	struct _pkg_repo_list_item *rit;

	assert(db != NULL);

-
	utstring_new(sql);
-

	switch(type) {
	case PKG_STATS_LOCAL_COUNT:
-
		utstring_printf(sql, "SELECT COUNT(id) FROM main.packages;");
+
		sql = "SELECT COUNT(id) FROM main.packages;";
		break;
	case PKG_STATS_LOCAL_SIZE:
-
		utstring_printf(sql, "SELECT SUM(flatsize) FROM main.packages;");
+
		sql = "SELECT SUM(flatsize) FROM main.packages;";
		break;
	case PKG_STATS_REMOTE_UNIQUE:
	case PKG_STATS_REMOTE_COUNT:
@@ -3112,21 +3110,20 @@ pkgdb_stats(struct pkgdb *db, pkg_stats_t type)
			if (repo->ops->stat != NULL)
				stats += repo->ops->stat(repo, type);
		}
-
		goto remote;
+
		return (stats);
		break;
	case PKG_STATS_REMOTE_REPOS:
		LL_FOREACH(db->repos, rit) {
			stats ++;
		}
-
		goto remote;
+
		return (stats);
		break;
	}

-
	pkg_debug(4, "Pkgdb: running '%s'", utstring_body(sql));
-
	ret = sqlite3_prepare_v2(db->sqlite, utstring_body(sql), -1, &stmt, NULL);
+
	pkg_debug(4, "Pkgdb: running '%s'", sql);
+
	ret = sqlite3_prepare_v2(db->sqlite, sql, -1, &stmt, NULL);
	if (ret != SQLITE_OK) {
-
		ERROR_SQLITE(db->sqlite, utstring_body(sql));
-
		utstring_free(sql);
+
		ERROR_SQLITE(db->sqlite, sql);
		return (-1);
	}

@@ -3136,9 +3133,6 @@ pkgdb_stats(struct pkgdb *db, pkg_stats_t type)

	sqlite3_finalize(stmt);

-
remote:
-
	utstring_free(sql);
-

	return (stats);
}