change merge spandisc to splitter

diff --git a/libs/spandisc/src/filehandler.c b/libs/spandisc/src/filehandler.c
index 8f3fb525ab9f0e979af8eb2a61c0c0bb757238b6..6364874040b48254396ee04f09d063f4c8e5b4ac 100644 (file)
--- a/libs/spandisc/src/filehandler.c
+++ b/libs/spandisc/src/filehandler.c
@@ -2,7 +2,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <stdint.h>
 
 #include "filehandler.h"
 

diff --git a/libs/spandisc/src/filehandler.h b/libs/spandisc/src/filehandler.h
index 21cada6b28c253b868e7a0ef5de12cc3e69dedc9..646ad47ab282916fd265f76df2c7505d08ccd4d2 100644 (file)
--- a/libs/spandisc/src/filehandler.h
+++ b/libs/spandisc/src/filehandler.h
@@ -1,7 +1,7 @@
 #ifndef _FILEHANDLER_H
 #define _FILEHANDLER_H
 
-#include "spandisc.h"
+#include "splitter.h"
 
 void read_input_file(const char *input, medium_t *srcdata);
 void write_output_file(const char *output, medium_t* disc);

diff --git a/libs/spandisc/src/libspandisc.h b/libs/spandisc/src/libspandisc.h
index 13396f1e3e8c98949bae86e345105db110d04e6a..e4ed3cf87b74fbdf58ed0c868d6a0b18297f22c5 100644 (file)
--- a/libs/spandisc/src/libspandisc.h
+++ b/libs/spandisc/src/libspandisc.h
@@ -1,9 +1,8 @@
 #ifndef _LIBSPANDISC_H
 #define _LIBSPANDISC_H
 
-#include "spandisc.h"
+#include "splitter.h"
 #include "logic.h"
 #include "filehandler.h"
-#include "splitter.h"
 
 #endif

diff --git a/libs/spandisc/src/logic.h b/libs/spandisc/src/logic.h
index 3aa9e2f432333aa8bb3e3ee9d0d0e6e7e1a038c6..b6a4e34144a52a93c155d4e749843d60f4419e70 100644 (file)
--- a/libs/spandisc/src/logic.h
+++ b/libs/spandisc/src/logic.h
@@ -1,7 +1,7 @@
 #ifndef _LOGIC_H
 #define _LOGIC_H
 
-#include "spandisc.h"
+#include "splitter.h"
 
 typedef void (*status_print_t)(const char *output, medium_t* disc);
 extern status_print_t status_print;

diff --git a/libs/spandisc/src/spandisc.c b/libs/spandisc/src/spandisc.c
deleted file mode 100644 (file)
index 1f64f08..0000000
--- a/libs/spandisc/src/spandisc.c
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <stdlib.h>
-#include <stdint.h>
-#include "spandisc.h"
-
-collection_t* init_collection()
-{
-       collection_t* col = malloc(sizeof(collection_t));
-
-       col->length = 0;
-       col->disc = NULL;
-
-       return col;
-}
-
-medium_t* init_medium()
-{
-       medium_t* medium = malloc(sizeof(medium_t));
-
-       medium->nr = 0;
-       medium->freespace = 0;
-       medium->length = 0;
-       medium->filearray = NULL;
-
-       return medium;
-}
-
-void free_file_size(file_size_t* file_size)
-{
-       free(file_size->name);
-       file_size->name = NULL;
-       free(file_size);
-       file_size = NULL;
-}
-
-void free_medium(medium_t *medium)
-{
-       free(medium->filearray);
-       medium->filearray = NULL;
-       free(medium);
-       medium = NULL;
-}
-
-void free_medium_complete(medium_t* medium)
-{
-       for (int i = 0; i < medium->length; i++) {
-               free_file_size(medium->filearray[i]);
-               medium->filearray[i] = NULL;
-       }
-
-       free_medium(medium);
-       medium = NULL;
-}
-
-void free_collection(collection_t *col)
-{
-       for (uint32_t i = 0; i < col->length; i++) {
-               free_medium_complete(col->disc[i]);
-               col->disc[i] = NULL;
-       }
-
-       free(col->disc);
-       col->disc = NULL;
-       free(col);
-       col = NULL;
-}
\ No newline at end of file

diff --git a/libs/spandisc/src/spandisc.h b/libs/spandisc/src/spandisc.h
deleted file mode 100644 (file)
index 62e2abe..0000000
--- a/libs/spandisc/src/spandisc.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _SPANDISC_H
-#define _SPANDISC_H
-
-typedef struct {
-       char* name;
-       uint64_t fsize;
-       uint32_t type;
-} file_size_t;
-
-typedef struct {
-       int16_t nr;
-       uint64_t freespace;
-       uint32_t length;
-       file_size_t **filearray;
-} medium_t;
-
-typedef struct {
-       uint32_t length;
-       medium_t **disc;
-} collection_t;
-
-collection_t* init_collection();
-medium_t* init_medium();
-void free_medium(medium_t *medium);
-void free_collection(collection_t *col);
-
-#endif

diff --git a/libs/spandisc/src/splitter.c b/libs/spandisc/src/splitter.c
index 414ae5040012a68dce7d749d19d1a9eda09159d5..7cc16e30a1200269f82641a7ae2dec40d725df14 100644 (file)
--- a/libs/spandisc/src/splitter.c
+++ b/libs/spandisc/src/splitter.c
@@ -2,13 +2,74 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-#include <stdint.h>
 
 #include "splitter.h"
 
 #define BLOCK_SIZE 2048.0
 #define S_IFREG 0100000 // bitmask for regular file; man inode
 
+collection_t* init_collection()
+{
+       collection_t* col = malloc(sizeof(collection_t));
+
+       col->length = 0;
+       col->disc = NULL;
+
+       return col;
+}
+
+medium_t* init_medium()
+{
+       medium_t* medium = malloc(sizeof(medium_t));
+
+       medium->nr = 0;
+       medium->freespace = 0;
+       medium->length = 0;
+       medium->filearray = NULL;
+
+       return medium;
+}
+
+void free_file_size(file_size_t* file_size)
+{
+       free(file_size->name);
+       file_size->name = NULL;
+       free(file_size);
+       file_size = NULL;
+}
+
+void free_medium(medium_t *medium)
+{
+       free(medium->filearray);
+       medium->filearray = NULL;
+       free(medium);
+       medium = NULL;
+}
+
+void free_medium_complete(medium_t* medium)
+{
+       for (int i = 0; i < medium->length; i++) {
+               free_file_size(medium->filearray[i]);
+               medium->filearray[i] = NULL;
+       }
+
+       free_medium(medium);
+       medium = NULL;
+}
+
+void free_collection(collection_t *col)
+{
+       for (uint32_t i = 0; i < col->length; i++) {
+               free_medium_complete(col->disc[i]);
+               col->disc[i] = NULL;
+       }
+
+       free(col->disc);
+       col->disc = NULL;
+       free(col);
+       col = NULL;
+}
+
 int cmpfunc(const void *filea, const void *fileb)
 {
        uint64_t a = (*(const file_size_t**)filea)->fsize;

diff --git a/libs/spandisc/src/splitter.h b/libs/spandisc/src/splitter.h
index e4aa092d55c91ed105d766ec4642a84c869b7c2e..7fe861355e9903d19b7de99224195f03eaca413f 100644 (file)
--- a/libs/spandisc/src/splitter.h
+++ b/libs/spandisc/src/splitter.h
@@ -1,7 +1,30 @@
 #ifndef _SPLITTER_H
 #define _SPLITTER_H
 
-#include "spandisc.h"
+#include <stdint.h>
+
+typedef struct {
+       char* name;
+       uint64_t fsize;
+       uint32_t type;
+} file_size_t;
+
+typedef struct {
+       int16_t nr;
+       uint64_t freespace;
+       uint32_t length;
+       file_size_t **filearray;
+} medium_t;
+
+typedef struct {
+       uint32_t length;
+       medium_t **disc;
+} collection_t;
+
+collection_t* init_collection();
+medium_t* init_medium();
+void free_medium(medium_t *medium);
+void free_collection(collection_t *col);
 
 medium_t* splitter(medium_t *srcdata);
 medium_t* ignore(medium_t *srcdata);