From 4cafbac22722c5738d25397e7c836a5ea0ab2289 Mon Sep 17 00:00:00 2001 From: Abdellah El Morabit Date: Thu, 17 Jul 2025 23:15:29 +0200 Subject: [PATCH] added the device file merge older conflicts --- README.md | 9 +++++++++ source/device.c | 23 +++++++++++++++++++++++ source/disk.c | 10 +--------- 3 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 source/device.c diff --git a/README.md b/README.md index 1a6ec75..74e066d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD # Resources gathering tool +======= +# synf-sys +>>>>>>> 1095ca1 (added the device file) System information retrieval software for synf. @@ -7,3 +11,8 @@ helps users throuble shoot performance issues and do general checkups on devices The system code is written in C and will be imported in the backend through cgo. +<<<<<<< HEAD +======= + + +>>>>>>> 1095ca1 (added the device file) diff --git a/source/device.c b/source/device.c new file mode 100644 index 0000000..1dcc33b --- /dev/null +++ b/source/device.c @@ -0,0 +1,23 @@ +/* + * ===================================================================================== + * + * Filename: device.c + * + * Description: + * + * Version: 1.0 + * Created: 07/17/25 23:14:35 + * Revision: none + * Compiler: gcc + * + * Author: YOUR NAME (), + * Organization: + * + * ===================================================================================== + */ +#include + +int main() { + return 0; +} + diff --git a/source/disk.c b/source/disk.c index 0608eb2..aec6f13 100644 --- a/source/disk.c +++ b/source/disk.c @@ -22,17 +22,9 @@ #include void disk_size(); -char* disk_partitions(); + typedef struct { - - char* partition_name; - unsigned long parition_size; - -} partition; - -typedef struct { - partition* paritions; long total_disk_size; } disk;