From 01fe19866cd8bdf597e8c1a7aa1954dc57675ffe Mon Sep 17 00:00:00 2001 From: nova Date: Thu, 26 Jun 2025 22:10:04 +0200 Subject: [PATCH] rename of content of struct file --- backend.c | 12 ++++++------ defines.h | 2 +- threading.c | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/backend.c b/backend.c index f7b3f7b..14dd2e0 100644 --- a/backend.c +++ b/backend.c @@ -70,12 +70,12 @@ void get_dir_content(char *path, unsigned long *dir_file_count, file *dir_conten lstat(full_path, file); - dir_content[i].file_size_bytes = file->st_size; + dir_content[i].file_size = file->st_size; if (S_ISDIR(file->st_mode)) { dir_content[i].file_type = FILE_TYPE_DIR; dir_content[i].color_pair = COLOR_DIR; - dir_content[i].file_size_bytes = get_dir_size(full_path); + dir_content[i].file_size = get_dir_size(full_path); } else if (file->st_mode & S_IXUSR) { dir_content[i].file_type = FILE_TYPE_EXEC; dir_content[i].color_pair = COLOR_EXEC; @@ -87,7 +87,7 @@ void get_dir_content(char *path, unsigned long *dir_file_count, file *dir_conten } else if (S_ISLNK(file->st_mode)) { dir_content[i].file_type = FILE_TYPE_SYMLINK; dir_content[i].color_pair = COLOR_SYMLINK; - dir_content[i].file_size_bytes = get_dir_size(full_path); + dir_content[i].file_size = get_dir_size(full_path); } else if (S_ISFIFO(file->st_mode)) { dir_content[i].file_type = FILE_TYPE_FIFO; dir_content[i].color_pair = COLOR_FIFO; @@ -149,7 +149,7 @@ void print_dir(WINDOW *win, unsigned long *line_width, unsigned long *dir_file_c } for (i = 0; i < *dir_file_count; i++) { - unsigned long offset_back = *line_width - (snprintf(NULL,0,"%ld",dir_content[i].file_size_bytes) + 1); + unsigned long offset_back = *line_width - (snprintf(NULL,0,"%ld",dir_content[i].file_size) + 1); unsigned long allowed_width = *line_width+1; wattron(win, COLOR_PAIR(dir_content[i].color_pair)); @@ -165,7 +165,7 @@ void print_dir(WINDOW *win, unsigned long *line_width, unsigned long *dir_file_c } mvwaddch(win, i, offset_front+j, dir_content[i].file_name[j]); } - mvwprintw(win, i, offset_back, "%ld", dir_content[i].file_size_bytes); + mvwprintw(win, i, offset_back, "%ld", dir_content[i].file_size); wattroff(win, A_REVERSE); } else { mvwprintw(win, i, 0, "%ld", i); @@ -176,7 +176,7 @@ void print_dir(WINDOW *win, unsigned long *line_width, unsigned long *dir_file_c } mvwaddch(win, i, offset_front+j, dir_content[i].file_name[j]); } - mvwprintw(win, i, offset_back, "%ld", dir_content[i].file_size_bytes); + mvwprintw(win, i, offset_back, "%ld", dir_content[i].file_size); } wattroff(win, COLOR_PAIR(dir_content[i].color_pair)); } diff --git a/defines.h b/defines.h index fc67743..e132635 100644 --- a/defines.h +++ b/defines.h @@ -61,7 +61,7 @@ typedef struct File { unsigned char file_type; unsigned short color_pair; unsigned long file_name_width; - unsigned long file_size_bytes; + unsigned long file_size; /*if its a file, its in bytes, if its a dir, its the count of files within that dir */ } file; typedef struct Color { char *file_extension; diff --git a/threading.c b/threading.c index 2506dec..eb6a616 100644 --- a/threading.c +++ b/threading.c @@ -75,7 +75,7 @@ void *thread_mid(void *data){ file_current.file_name = malloc(mid_content[selected_file_current].file_name_width + 1); strcpy(file_current.file_name, mid_content[selected_file_current].file_name); file_current.file_name_width = mid_content[selected_file_current].file_name_width; - file_current.file_size_bytes = mid_content[selected_file_current].file_size_bytes; + file_current.file_size = mid_content[selected_file_current].file_size; file_current.file_type = mid_content[selected_file_current].file_type; pthread_mutex_unlock(&mutex_selection); @@ -122,7 +122,7 @@ void *thread_rgt(void *data){ rgt_content[0].file_name = malloc(file_current.file_name_width + 1); strcpy(rgt_content[0].file_name, file_current.file_name); rgt_content[0].file_name_width = file_current.file_name_width; - rgt_content[0].file_size_bytes = file_current.file_size_bytes; + rgt_content[0].file_size = file_current.file_size; rgt_content[0].file_type = file_current.file_type; pthread_mutex_unlock(&mutex_mid); @@ -144,7 +144,7 @@ void *thread_rgt(void *data){ rgt_content[0].file_type = FILE_TYPE_OPEN_FILE; rgt_content[0].status = FILE_STATUS_HOVER; free(rgt_buffer); - rgt_buffer = preview_file(rgt_content[0].file_name, rgt_content[0].file_size_bytes); + rgt_buffer = preview_file(rgt_content[0].file_name, rgt_content[0].file_size); } @@ -184,7 +184,7 @@ void threading_init(){ btm_buffer = malloc(sizeof(char)); file_current.file_type = 0; - file_current.file_size_bytes = 1; + file_current.file_size = 1; file_current.file_name_width = 1; file_current.file_name = "a";