rename header file to spandisc

diff --git a/discspan/discspan.c b/discspan/discspan.c
index fce4b6bb06dc0b49a7af1aaa5c7d1d3de3d1385a..64f14944d2aa61b68db0de4017377b5fff10b753 100644 (file)
--- a/discspan/discspan.c
+++ b/discspan/discspan.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "discspan.h"
+#include "spandisc.h"
 #include "logic.h"
 #include "help.h"
 

diff --git a/discspan/help.h b/discspan/help.h
new file mode 100644 (file)
index 0000000..d88fd30
--- /dev/null
+++ b/discspan/help.h
@@ -0,0 +1,6 @@
+#ifndef _HELP_H
+#define _HELP_H
+
+void usage();
+
+#endif

diff --git a/include/discspan.h b/include/discspan.h
deleted file mode 100644 (file)
index 611a78d..0000000
--- a/include/discspan.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _DISCSPAN_H
-#define _DISCSPAN_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/help.h b/include/help.h
deleted file mode 100644 (file)
index d88fd30..0000000
--- a/include/help.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _HELP_H
-#define _HELP_H
-
-void usage();
-
-#endif

diff --git a/include/spandisc.h b/include/spandisc.h
new file mode 100644 (file)
index 0000000..244ee16
--- /dev/null
+++ b/include/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/filehandler.c b/libspandisc/filehandler.c
index 13e8785a79b2c80a8f075e8d7484fb56ab48ba75..cb209af0ec5f4fd81c341acf484ee598b83002db 100644 (file)
--- a/libspandisc/filehandler.c
+++ b/libspandisc/filehandler.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "discspan.h"
+#include "spandisc.h"
 #include "filehandler.h"
 
 void malloc_array_length(FILE *in, medium_t *srcdata)

diff --git a/libspandisc/logic.c b/libspandisc/logic.c
index 79da719b396dd3ef9ed1981fd31c7f146c70f350..837b2046b93e2bb428d3bcd5af3d038f7e795435 100644 (file)
--- a/libspandisc/logic.c
+++ b/libspandisc/logic.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "discspan.h"
+#include "spandisc.h"
 #include "logic.h"
 #include "splitter.h"
 #include "filehandler.h"

diff --git a/libspandisc/splitter.c b/libspandisc/splitter.c
index d057ea9a0115fa590e94bc00268cdd77805f3f76..54f48a30700649012ce946788035df906cfbaff5 100644 (file)
--- a/libspandisc/splitter.c
+++ b/libspandisc/splitter.c
@@ -1,7 +1,8 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include "discspan.h"
+
+#include "spandisc.h"
 #include "splitter.h"
 
 #define S_IFREG 0100000 // bitmask for regular file; man inode