From 1786e05b56e5792de41b5a1c3824da35fcbfd38d Mon Sep 17 00:00:00 2001
From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 15 Aug 2021 10:52:01 +0200
Subject: [PATCH] change: move sort into split all

---
 libs/spandisc/src/logic.c    | 17 -----------------
 libs/spandisc/src/splitter.c | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/libs/spandisc/src/logic.c b/libs/spandisc/src/logic.c
index 9f6997f..4662d3b 100644
--- a/libs/spandisc/src/logic.c
+++ b/libs/spandisc/src/logic.c
@@ -13,28 +13,11 @@ void on_status_print(const char *output, medium_t disc)
 		status_print(output, disc);
 }
 
-int cmpfunc(const void *filea, const void *fileb)
-{
-	unsigned long long a = ((const file_size_t*)filea)->fsize;
-	unsigned long long b = ((const file_size_t*)fileb)->fsize;
-
-	if (a < b)
-		return 1;
-	else if (a > b)
-		return -1;
-	else if (a == b)
-		return 0;
-	else
-		return -2;
-}
-
 void span(const char *input, const char *output, unsigned long long split)
 {
 	medium_t srcdata = { 0, split, 0, NULL };
 	read_input_file(input, &srcdata);
 
-	qsort(srcdata.filearray, srcdata.length, sizeof(file_size_t), cmpfunc);
-
 	collection_t col = split_all(&srcdata);
 
 	char outname[strlen(output) + 4];
diff --git a/libs/spandisc/src/splitter.c b/libs/spandisc/src/splitter.c
index 83be098..d509f57 100644
--- a/libs/spandisc/src/splitter.c
+++ b/libs/spandisc/src/splitter.c
@@ -7,6 +7,21 @@
 
 #define S_IFREG 0100000 // bitmask for regular file; man inode
 
+int cmpfunc(const void *filea, const void *fileb)
+{
+	unsigned long long a = ((const file_size_t*)filea)->fsize;
+	unsigned long long b = ((const file_size_t*)fileb)->fsize;
+
+	if (a < b)
+		return 1;
+	else if (a > b)
+		return -1;
+	else if (a == b)
+		return 0;
+	else
+		return -2;
+}
+
 void free_medium(medium_t *medium)
 {
 	free(medium->filearray);
@@ -107,6 +122,8 @@ medium_t ignore(medium_t *srcdata)
 
 collection_t split_all(medium_t *srcdata)
 {
+	qsort(srcdata->filearray, srcdata->length, sizeof(file_size_t), cmpfunc);
+
 	collection_t col = { 0, NULL };
 
 	medium_t ignoredisc = { 0, 0, 0, NULL };
-- 
2.39.5