From 36adf81e1ccbbe65b753de9330728ef1241bce4c Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Thu, 12 Aug 2021 18:46:00 +0200 Subject: [PATCH] change: header files into src dirs --- discspan/discspan.c | 3 +-- include/libspandisc.h | 31 ++++---------------------- {include => libspandisc}/filehandler.h | 0 {include => libspandisc}/logic.h | 0 {include => libspandisc}/spandisc.h | 0 {include => libspandisc}/splitter.h | 0 6 files changed, 5 insertions(+), 29 deletions(-) rename {include => libspandisc}/filehandler.h (100%) rename {include => libspandisc}/logic.h (100%) rename {include => libspandisc}/spandisc.h (100%) rename {include => libspandisc}/splitter.h (100%) diff --git a/discspan/discspan.c b/discspan/discspan.c index 64f1494..43b4132 100644 --- a/discspan/discspan.c +++ b/discspan/discspan.c @@ -2,8 +2,7 @@ #include #include -#include "spandisc.h" -#include "logic.h" +#include "libspandisc.h" #include "help.h" extern void useage(); diff --git a/include/libspandisc.h b/include/libspandisc.h index 7ee389a..fdc1960 100644 --- a/include/libspandisc.h +++ b/include/libspandisc.h @@ -1,32 +1,9 @@ #ifndef LIBSPANDISC_H #define LIBSPANDISC_H -typedef struct { - char name[255]; - unsigned long long fsize; - unsigned int type; -} file_size_t; - -typedef struct { - int nr; - unsigned long long freespace; - int length; - file_size_t *filearray; -} medium_t; - -typedef struct { - int length; - medium_t *disc; -} collection_t; - -void read_input_file(const char *input, medium_t *srcdata); -void write_output_file(const char *output, medium_t disc); - -void (*status_print)(const char *output, medium_t disc); -void run(const char *input, const char *output, unsigned long long split); - -medium_t splitter(medium_t *srcdata); -medium_t ignore(medium_t *srcdata); -collection_t split_all(medium_t *srcdata); +#include "../libspandisc/spandisc.h" +#include "../libspandisc/logic.h" +#include "../libspandisc/splitter.h" +#include "../libspandisc/filehandler.h" #endif diff --git a/include/filehandler.h b/libspandisc/filehandler.h similarity index 100% rename from include/filehandler.h rename to libspandisc/filehandler.h diff --git a/include/logic.h b/libspandisc/logic.h similarity index 100% rename from include/logic.h rename to libspandisc/logic.h diff --git a/include/spandisc.h b/libspandisc/spandisc.h similarity index 100% rename from include/spandisc.h rename to libspandisc/spandisc.h diff --git a/include/splitter.h b/libspandisc/splitter.h similarity index 100% rename from include/splitter.h rename to libspandisc/splitter.h -- 2.39.5