change: header files into src dirs

diff --git a/discspan/discspan.c b/discspan/discspan.c
index 64f14944d2aa61b68db0de4017377b5fff10b753..43b4132c78e5b84ef63b3b40d96baaceaa3e4ffe 100644 (file)
--- a/discspan/discspan.c
+++ b/discspan/discspan.c
@@ -2,8 +2,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "spandisc.h"
-#include "logic.h"
+#include "libspandisc.h"
 #include "help.h"
 
 extern void useage();

diff --git a/include/filehandler.h b/include/filehandler.h
deleted file mode 100644 (file)
index 04bd2ee..0000000
--- a/include/filehandler.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _FILEHANDLER_H
-#define _FILEHANDLER_H
-
-void read_input_file(const char *input, medium_t *srcdata);
-
-void write_output_file(const char *output, medium_t disc);
-
-#endif

diff --git a/include/libspandisc.h b/include/libspandisc.h
index 7ee389ae55b99f3dd9a52520f36493111f0641c6..fdc1960721532fb240e650f40ca1d414fe182485 100644 (file)
--- 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/logic.h b/include/logic.h
deleted file mode 100644 (file)
index 9c23e57..0000000
--- a/include/logic.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _LOGIC_H
-#define _LOGIC_H
-
-void (*status_print)(const char *output, medium_t disc);
-
-void run(const char *input, const char *output, unsigned long long split);
-
-#endif

diff --git a/include/spandisc.h b/include/spandisc.h
deleted file mode 100644 (file)
index 244ee16..0000000
--- a/include/spandisc.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _SPANDISC_H
-#define _SPANDISC_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;
-
-#endif

diff --git a/include/splitter.h b/include/splitter.h
deleted file mode 100644 (file)
index 3c5c148..0000000
--- a/include/splitter.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _SPLITTER_H
-#define _SPLITTER_H
-
-medium_t splitter(medium_t *srcdata);
-medium_t ignore(medium_t *srcdata);
-collection_t split_all(medium_t *srcdata);
-
-#endif

diff --git a/libspandisc/filehandler.h b/libspandisc/filehandler.h
new file mode 100644 (file)
index 0000000..04bd2ee
--- /dev/null
+++ b/libspandisc/filehandler.h
@@ -0,0 +1,8 @@
+#ifndef _FILEHANDLER_H
+#define _FILEHANDLER_H
+
+void read_input_file(const char *input, medium_t *srcdata);
+
+void write_output_file(const char *output, medium_t disc);
+
+#endif

diff --git a/libspandisc/logic.h b/libspandisc/logic.h
new file mode 100644 (file)
index 0000000..9c23e57
--- /dev/null
+++ b/libspandisc/logic.h
@@ -0,0 +1,8 @@
+#ifndef _LOGIC_H
+#define _LOGIC_H
+
+void (*status_print)(const char *output, medium_t disc);
+
+void run(const char *input, const char *output, unsigned long long split);
+
+#endif

diff --git a/libspandisc/spandisc.h b/libspandisc/spandisc.h
new file mode 100644 (file)
index 0000000..244ee16
--- /dev/null
+++ b/libspandisc/spandisc.h
@@ -0,0 +1,22 @@
+#ifndef _SPANDISC_H
+#define _SPANDISC_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;
+
+#endif

diff --git a/libspandisc/splitter.h b/libspandisc/splitter.h
new file mode 100644 (file)
index 0000000..3c5c148
--- /dev/null
+++ b/libspandisc/splitter.h
@@ -0,0 +1,8 @@
+#ifndef _SPLITTER_H
+#define _SPLITTER_H
+
+medium_t splitter(medium_t *srcdata);
+medium_t ignore(medium_t *srcdata);
+collection_t split_all(medium_t *srcdata);
+
+#endif