From 3d02716494ad8eaf66d68c097bf2b7c47c02fda0 Mon Sep 17 00:00:00 2001
From: Bastian Dehn <hhaalo@arcor.de>
Date: Sat, 11 Oct 2025 18:45:03 +0200
Subject: [PATCH] fix style issues

---
 libs/spandisc/src/filehandler.c |  2 +-
 libs/spandisc/src/filehandler.h |  2 +-
 libs/spandisc/src/logic.h       |  2 +-
 libs/spandisc/src/splitter.c    |  8 ++++----
 src/discspan.c                  | 11 ++++-------
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/libs/spandisc/src/filehandler.c b/libs/spandisc/src/filehandler.c
index dc98a61..93c92c1 100644
--- a/libs/spandisc/src/filehandler.c
+++ b/libs/spandisc/src/filehandler.c
@@ -58,7 +58,7 @@ void read_input_file(const char* input, medium_t* srcdata)
 	fclose(in);
 }
 
-void write_output_file(const char* output, medium_t* disc)
+void write_output_file(const char* output, const medium_t* disc)
 {
 	FILE* out = fopen(output, "w");
 
diff --git a/libs/spandisc/src/filehandler.h b/libs/spandisc/src/filehandler.h
index e3c1f3b..d9aea34 100644
--- a/libs/spandisc/src/filehandler.h
+++ b/libs/spandisc/src/filehandler.h
@@ -4,6 +4,6 @@
 #include "splitter.h"
 
 void read_input_file(const char* input, medium_t* srcdata);
-void write_output_file(const char* output, medium_t* disc);
+void write_output_file(const char* output, const medium_t* disc);
 
 #endif
diff --git a/libs/spandisc/src/logic.h b/libs/spandisc/src/logic.h
index 45f5238..1a48b80 100644
--- a/libs/spandisc/src/logic.h
+++ b/libs/spandisc/src/logic.h
@@ -3,7 +3,7 @@
 
 #include "splitter.h"
 
-typedef void (*status_print_t)(const char* output, medium_t* disc);
+typedef void (*status_print_t)(const char* output, const medium_t* disc);
 
 const char* get_version();
 void set_status_print(status_print_t status_print_fn);
diff --git a/libs/spandisc/src/splitter.c b/libs/spandisc/src/splitter.c
index 3a2e244..db04b84 100644
--- a/libs/spandisc/src/splitter.c
+++ b/libs/spandisc/src/splitter.c
@@ -94,7 +94,7 @@ int strcmpfunc(const void* filea, const void* fileb)
 	return strcmp(filename1, filename2);
 }
 
-bool can_add_file_to_medium(medium_t *disc, file_size_t *file)
+bool can_add_file_to_medium(medium_t *disc, const file_size_t *file)
 {
 	uint64_t filesize = ceil(file->fsize / BLOCK_SIZE) * BLOCK_SIZE;
 
@@ -105,7 +105,7 @@ bool can_add_file_to_medium(medium_t *disc, file_size_t *file)
 	return true;
 }
 
-bool bigger_file_ignore_medium(medium_t* disc, file_size_t* file)
+bool bigger_file_ignore_medium(medium_t* disc, const file_size_t* file)
 {
 	uint64_t filesize = ceil(file->fsize / BLOCK_SIZE) * BLOCK_SIZE;
 
@@ -123,7 +123,7 @@ void add_item_medium(medium_t* medium, file_size_t* item)
 	medium->length++;
 }
 
-void move_rest_to_srcdata(medium_t* rest, medium_t* srcdata)
+void move_rest_to_srcdata(const medium_t* rest, medium_t* srcdata)
 {
 	free(srcdata->filearray);
 	srcdata->filearray = NULL;
@@ -153,7 +153,7 @@ void add_ignoredisc_to_collection(medium_t* ignoredisc, collection_t* col)
 }
 
 medium_t* splitter_to_disc(medium_t* srcdata,
-		bool (*check)(medium_t*, file_size_t*))
+		bool (*check)(medium_t*, const file_size_t*))
 {
 	qsort(srcdata->filearray, srcdata->length, sizeof(file_size_t*), cmpfunc);
 
diff --git a/src/discspan.c b/src/discspan.c
index 1b06f04..2265b76 100644
--- a/src/discspan.c
+++ b/src/discspan.c
@@ -33,13 +33,12 @@ void useage()
 	printf("   -h\t\tshow this help\n\n");
 }
 
-void print_human_read_size(const char* output, medium_t* medium)
+void print_human_read_size(const char* output, const medium_t* medium)
 {
-	uint64_t humanread;
+	uint64_t humanread = medium->freespace;
 	char einheit[6] = {'B', 'K', 'M', 'G', 'T', 'P'};
 	uint8_t i = 0;
 
-	humanread = medium->freespace;
 	while (humanread >= 1024) {
 		humanread /= 1024;
 		i++;
@@ -70,11 +69,9 @@ int main(int argc, char* argv[])
 		{ "free-size", required_argument, 0, 'f' }
 	};
 
-	int32_t opt_index = 0;
-	int32_t opt_value = 0;
 	for (int32_t i = 0; i < argc; i++) {
-		opt_index = 0;
-		opt_value = getopt_long(argc, argv, "i:o:59bcfhv", loption, &opt_index);
+		int32_t opt_index = 0;
+		int32_t opt_value = getopt_long(argc, argv, "i:o:59bcfhv", loption, &opt_index);
 		switch (opt_value) {
 		case -1:
 			break;
-- 
2.47.3