From 12413503b447847533f02ebabafe5525f4b19603 Mon Sep 17 00:00:00 2001 From: dam Date: Sat, 26 Nov 2022 02:06:07 +0000 Subject: Fixed assert that validated task to belong to database. --- main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/main.c b/main.c index 5112448..87d8f31 100644 --- a/main.c +++ b/main.c @@ -344,7 +344,7 @@ bool duplicate_task(database_st *db, task_st *task) { bool delete_task(database_st *db, task_st *task) { assert(db != NULL); assert(task != NULL); - assert(task >= db->tasks && task < &db->tasks[db->count]); + assert(task >= db->tasks && task - db->tasks < db->count); // Remove task timer values from total timers. for (int idx = 0; idx < NUM_WEEK_DAYS; idx++) { @@ -390,7 +390,7 @@ bool delete_task(database_st *db, task_st *task) { bool move_task(database_st *db, task_st *task, size_t target) { assert(db != NULL); assert(task != NULL); - assert(task >= db->tasks && task < &db->tasks[db->count]); + assert(task >= db->tasks && task - db->tasks < db->count); assert(target >= 0 && target < db->count); // Move tasks after the index position to their new positions. @@ -490,7 +490,7 @@ void update_total_times(database_st *db) { void reset_task_times(database_st *db, task_st *task) { assert(db != NULL); assert(task != NULL); - assert(task >= db->tasks && task < &db->tasks[db->count]); + assert(task >= db->tasks && task - db->tasks < db->count); // Make sure we sync before applying the changes. update_times(db); @@ -507,7 +507,7 @@ void reset_task_times(database_st *db, task_st *task) { void set_task_time(database_st *db, task_st *task, int day, int64_t time) { assert(db != NULL); assert(task != NULL); - assert(task >= db->tasks && task < &db->tasks[db->count]); + assert(task >= db->tasks && task - db->tasks < db->count); // Make sure we sync before applying the changes. update_times(db); @@ -736,7 +736,7 @@ void select_task_by_delta(database_st *db, ptrdiff_t delta) { void select_task(database_st *db, task_st *task) { assert(db != NULL); assert(task != NULL); - assert(task >= db->tasks && task < &db->tasks[db->count]); + assert(task >= db->tasks && task - db->tasks < db->count); db->selected_task = task - db->tasks; } -- cgit v1.2.3