From 4fac0b884665c67e840cc53f90eaae583729932c Mon Sep 17 00:00:00 2001 From: dam Date: Sun, 27 Nov 2022 02:54:17 +0000 Subject: Review code for usage of ptrdiff_t - WIP. --- main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/main.c b/main.c index 87d8f31..a9e76a9 100644 --- a/main.c +++ b/main.c @@ -35,7 +35,7 @@ #include #include -#define VERSION "1.0" // Use only 3 chars (to fit layouts). +#define VERSION "0.01" // Use only 3 chars (to fit layouts). #define TASK_NAME_LENGTH 57 // Task name length. #define TASK_NAME_BYTES (TASK_NAME_LENGTH+1) #define FIRST_DAY_OF_WEEK 1 // (0-6, Sunday = 0). @@ -52,6 +52,7 @@ typedef struct { } task_st; typedef struct { + // TODO Validate usage of size_t and ptrdiff_t variables. task_st *tasks; size_t count; // Will always be equal or less than capacity. size_t capacity; // Will always be equal or less than PTRDIFF_MAX (see MAX_DATABASE_TASKS). @@ -357,7 +358,7 @@ bool delete_task(database_st *db, task_st *task) { db->count--; // Adjust selected task. - if (db->selected_task >= db->count) { // TODO Can we compare ptrdiff_t with size_t? + if (db->selected_task >= db->count) { db->selected_task--; } @@ -394,7 +395,7 @@ bool move_task(database_st *db, task_st *task, size_t target) { assert(target >= 0 && target < db->count); // Move tasks after the index position to their new positions. - ptrdiff_t index = task - db->tasks; + ptrdiff_t index = task - db->tasks; // TODO WIP (validate ptrdiff_t variables) task_st *target_task = &db->tasks[target]; ptrdiff_t target_index = target_task - db->tasks; @@ -427,7 +428,7 @@ bool move_task(database_st *db, task_st *task, size_t target) { db->selected_task = target_index; - return true; // TODO + return true; } // Updates the times on the active task (and adjusts database totals). @@ -812,7 +813,7 @@ void initialize_tui() { layouts[L_COMPACT] = (layout_st) { .archive_title = " Archive ", .columns = { - { .header = " TTT v" VERSION " ", .width = -1, .alignment = 'L' }, + { .header = " TTT " VERSION " ", .width = -1, .alignment = 'L' }, { .header = " S ", .width = 5, .alignment = 'C' }, { .header = " M ", .width = 5, .alignment = 'C' }, { .header = " T ", .width = 5, .alignment = 'C' }, @@ -1531,7 +1532,7 @@ int main(int argc, char *argv[]) { size_t target = input < 0 ? 0 : input >= db->count ? db->count - 1 : input; - move_task(db, selected_task, target); + move_task(db, selected_task, target); // TODO Error checking. trigger_autosave(); -- cgit v1.2.3