From 00292107186fcef8bd004aaef233889156ae1398 Mon Sep 17 00:00:00 2001 From: Abdellah El Morabit Date: Sat, 11 Oct 2025 21:26:04 +0200 Subject: [PATCH] [refactor] repositioned the structs from the header file to the library file --- CMakeLists.txt | 1 - source/lib.c | 31 ++++++++++++++++++++++++++++--- source/main.c | 2 +- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d0baf4a..c75b008 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,5 +8,4 @@ ADD_EXECUTABLE(main source/lib.c ) -ADD_EXECUTABLE(source/main.c source/lib.c) TARGET_INCLUDE_DIRECTORIES(main PRIVATE source/lib/osx source/lib/linux) diff --git a/source/lib.c b/source/lib.c index c9bf91a..67a487b 100644 --- a/source/lib.c +++ b/source/lib.c @@ -24,7 +24,7 @@ typedef struct { unsigned long mem_size; -} ram; +} ram_s; unsigned long get_total(void); unsigned long get_usage(void); @@ -39,6 +39,7 @@ void cpu_temperature(unsigned short delay); char* cpu_frequency(void); cpu_s _cpu; +ram_s _ram; void *cpu_name(){ int buffer_size = 256; @@ -253,6 +254,7 @@ long device_up_time(void){ return info.uptime; } +#endif #ifdef __APPLE__ #include @@ -263,12 +265,36 @@ long device_up_time(void){ #include #include #include -#include #include #define CONVERT_BYTES_TO_GIGABYTES 107374182 #define D 1073741824 + +typedef struct{ + char* name; +} device_s; + +typedef struct { + + int frequency; + char* name; + int threads; + +} cpu_s; + +typedef struct { + long double total; + long double available; +} ram_s; + +typedef struct { + long long size; + short name; +} disk_s; + + + typedef struct { cpu_s* cpu; @@ -288,7 +314,6 @@ unsigned long get_total(void); unsigned long get_usage(void); long device_up_time(void); float cpu_frequency(void); -char* cpu_name(void); void size(); void av_size(); void* ram_i(); diff --git a/source/main.c b/source/main.c index 83b3408..f7a4cb4 100644 --- a/source/main.c +++ b/source/main.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include "lib.h" #include #include