aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sql.c
diff options
context:
space:
mode:
authorYunchih Chen <yunchih.cat@gmail.com>2018-12-10 22:48:27 +0800
committerYunchih Chen <yunchih.cat@gmail.com>2018-12-10 22:48:27 +0800
commitd791a1ca79b5dd35e030a3d40270a39218e9cb0f (patch)
tree6e1e5bea37029dcea4108da2a2d92299ae68b4d9 /lib/sql.c
parent098b0b68c9bc4b4fefb616cf9af4dc4a3bb92e8b (diff)
downloadnfcollect-d791a1ca79b5dd35e030a3d40270a39218e9cb0f.tar.gz
nfcollect-d791a1ca79b5dd35e030a3d40270a39218e9cb0f.tar.zst
nfcollect-d791a1ca79b5dd35e030a3d40270a39218e9cb0f.zip
Miscellaneous improvements
Diffstat (limited to 'lib/sql.c')
-rw-r--r--lib/sql.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/sql.c b/lib/sql.c
index 99f97ef..1b4df89 100644
--- a/lib/sql.c
+++ b/lib/sql.c
@@ -232,7 +232,7 @@ int db_delete_oldest_bytes(sqlite3 *db, int64_t bytes) {
size_t bufsize = 1024;
char *buf = malloc(bufsize);
- while (bytes >= 0) {
+ while (true) {
rc = sqlite3_step(stmt);
if (rc == SQLITE_DONE)
break;
@@ -240,8 +240,12 @@ int db_delete_oldest_bytes(sqlite3 *db, int64_t bytes) {
sqlite3_int64 index = sqlite3_column_int64(stmt, 2);
int size = sqlite3_column_int(stmt, 0);
+ bytes -= size;
+ if (bytes <= 0)
+ break;
+
char _buf[22];
- sprintf(_buf, count ? "%lld" : ",%lld", index);
+ sprintf(_buf, count ? ",%lld" : "%lld", index);
while (strlen(_buf) + strlen(buf) + 2 >= bufsize) {
bufsize *= 2;
char *__buf = malloc(bufsize);