From e0a44b9c2b4c309bb16d110e0176d3f476c7b18d Mon Sep 17 00:00:00 2001 From: Abdellah El Morabit Date: Mon, 13 Oct 2025 14:13:10 +0200 Subject: [PATCH] [refactor] created a new types header, seperated the structs from the lib.c --- source/lib.c | 32 +++++---------------- source/lib.h | 16 +++++++---- source/main.c | 78 ++++++++++++++++++++++++++------------------------ source/types.h | 29 +++++++++++++++++++ 4 files changed, 87 insertions(+), 68 deletions(-) create mode 100644 source/types.h diff --git a/source/lib.c b/source/lib.c index d65af5d..4fe6476 100644 --- a/source/lib.c +++ b/source/lib.c @@ -6,37 +6,13 @@ #include #include #include +#include "types.h" #define MAXC 1024 #define MAXC_CHAR 256 #define CONVERT_BYTES_TO_GIGABYTES 107374182 #define D 1073741824 -typedef struct { - - int frequency; - int temperature; - char* name; - int threads; - -} cpu_s; - -typedef struct { - unsigned long total; - unsigned long available; -} ram_s; - -typedef struct { - long long size; - short name; -} disk_s; - -typedef struct { - char* name; - char* hostname; - char* os_version; -} device_s; - void cpu_name(); void cpu_threads(); void cpu_temperature(); @@ -254,6 +230,12 @@ void cpu_frequency(){ return; } +void cpu_temperature(cpu_s cpu) +{ + cpu.temperature = 0; + return; +} + void mem_size() { int64_t size; size_t len = sizeof(size); diff --git a/source/lib.h b/source/lib.h index e38f523..26762e2 100644 --- a/source/lib.h +++ b/source/lib.h @@ -3,19 +3,23 @@ #ifdef __APPLE__ -void get_device_info(); -void disk_size(); -void size(); -void av_size(); -void ram_info(); -void cpu_frequency(); void cpu_name(); void cpu_threads(); void cpu_temperature(); void cpu_frequency(); + +void disk_size(); +void size(); + +void av_size(); +void ram_info(); + void mem_size(); void mem_av_size(); +void get_device_info(); +void get_os_version(); + #endif #endif diff --git a/source/main.c b/source/main.c index 23b86e7..e466b7c 100644 --- a/source/main.c +++ b/source/main.c @@ -9,52 +9,50 @@ void *gather_cpu_information(); void *gather_ram_information(); void *gather_disk_information(); void *gather_device_information(); +void get_c_version(); /* -cJSON convert_to_json() { + cJSON convert_to_json() { - cJSON *root = cJSON_CreateObject(); - cJSON_AddStringToObject(root, "cpu", info.cpu->name); - cJSON_AddNumberToObject(root, "ram", info.ram->total); - cJSON_AddStringToObject(root, "disk", info.disk->name); - cJSON_AddStringToObject(root, "device", info.device->name); + cJSON *root = cJSON_CreateObject(); + cJSON_AddStringToObject(root, "cpu", info.cpu->name); + cJSON_AddNumberToObject(root, "ram", info.ram->total); + cJSON_AddStringToObject(root, "disk", info.disk->name); + cJSON_AddStringToObject(root, "device", info.device->name); - return *root; + return *root; + } + + void handler(char *url) { + CURL *curl; + CURLcode res; + + curl_global_init(CURL_GLOBAL_ALL); + curl = curl_easy_init(); + + if (curl) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "POST"); + curl_easy_setopt(curl, CURLOPT_URL, url); + +// TO DO +// parse the object to a json and pass that as an argument to post it +curl_easy_setopt(curl, CURLOPT_POSTFIELDS, NULL); + +res = curl_easy_perform(curl); +if (res != CURLE_OK) +fprintf(stderr, "curl_easy_perform() failed: %s\n", +curl_easy_strerror(res)); + +curl_easy_cleanup(curl); } - -void handler(char *url) { - CURL *curl; - CURLcode res; - - curl_global_init(CURL_GLOBAL_ALL); - curl = curl_easy_init(); - - if (curl) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "POST"); - curl_easy_setopt(curl, CURLOPT_URL, url); - - // TO DO - // parse the object to a json and pass that as an argument to post it - curl_easy_setopt(curl, CURLOPT_POSTFIELDS, NULL); - - res = curl_easy_perform(curl); - if (res != CURLE_OK) - fprintf(stderr, "curl_easy_perform() failed: %s\n", - curl_easy_strerror(res)); - - curl_easy_cleanup(curl); - } - curl_global_cleanup(); +curl_global_cleanup(); } */ - - -#ifdef __APPLE__ - -int main(int argc, char** argv) { +void get_c_version() +{ #if __STDC_VERSION__ printf("C standard version: %ld\n", __STDC_VERSION__); @@ -62,7 +60,12 @@ int main(int argc, char** argv) { printf("C standard not defined\n"); #endif - // handler("api.nsrddyn.com"); + +} + +#ifdef __APPLE__ + +int main(int argc, char** argv) { return 0; } @@ -75,6 +78,7 @@ int main(int argc, char** argv) { return 0; + } #endif diff --git a/source/types.h b/source/types.h new file mode 100644 index 0000000..25566d7 --- /dev/null +++ b/source/types.h @@ -0,0 +1,29 @@ +#ifndef TYPES_H +#define TYPES_H + +typedef struct { + + char* name; + int frequency; + int temperature; + int threads; + +} cpu_s; + +typedef struct { + unsigned long total; + unsigned long available; +} ram_s; + +typedef struct { + long long size; + short name; +} disk_s; + +typedef struct { + char* name; + char* hostname; + char* os_version; +} device_s; + +#endif