change headers only c

diff --git a/libs/spandisc/src/config_spandisc.h.in b/libs/spandisc/src/config_spandisc.h.in
index c02de9aec1cbbca953dedd89ffd5b5a30b5c3a45..e4f520991c7e30254aba35d99cbef4c031e80660 100644 (file)
--- a/libs/spandisc/src/config_spandisc.h.in
+++ b/libs/spandisc/src/config_spandisc.h.in
@@ -1,14 +1,6 @@
 #ifndef CONFIG_SPANDISC_IN_H
 #define CONFIG_SPANDISC_IN_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define SPANDISC_VERSION "@PROJECT_VERSION@"
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

diff --git a/libs/spandisc/src/filehandler.c b/libs/spandisc/src/filehandler.c
index 0d91436460e9a42968f4cd478e61cca6e9b2608a..437e97a806d7b10d6350d56a767a007e74bf49b2 100644 (file)
--- a/libs/spandisc/src/filehandler.c
+++ b/libs/spandisc/src/filehandler.c
@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "spandisc.h"
 #include "filehandler.h"
 
 #define MAX_PATH_LENGTH 255

diff --git a/libs/spandisc/src/filehandler.h b/libs/spandisc/src/filehandler.h
index b720d1c7eea054700e21cae8a5946e31d6f762fc..21cada6b28c253b868e7a0ef5de12cc3e69dedc9 100644 (file)
--- a/libs/spandisc/src/filehandler.h
+++ b/libs/spandisc/src/filehandler.h
@@ -1,28 +1,9 @@
 #ifndef _FILEHANDLER_H
 #define _FILEHANDLER_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "spandisc.h"
 
-/**
- * Read a text file with file pathes into medium_t struct
- *
- * @param input is the input file path
- * @param pointer to an empty medium_t struct
- */
 void read_input_file(const char *input, medium_t *srcdata);
-
-/**
- * Write a text file with file pathes from medium_t struct
- *
- * @param output is the file name
- * @param disc is the struct with file pathes
- */
 void write_output_file(const char *output, medium_t* disc);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

diff --git a/libs/spandisc/src/libspandisc.h b/libs/spandisc/src/libspandisc.h
index 443ed1e88a269163d0b0ab123cba66f094e75107..13396f1e3e8c98949bae86e345105db110d04e6a 100644 (file)
--- a/libs/spandisc/src/libspandisc.h
+++ b/libs/spandisc/src/libspandisc.h
@@ -1,21 +1,9 @@
 #ifndef _LIBSPANDISC_H
 #define _LIBSPANDISC_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// contains struct types
 #include "spandisc.h"
-// contains spanning logic with read and write file
 #include "logic.h"
-// read and write a text file
 #include "filehandler.h"
-// contains splitting logic
 #include "splitter.h"
 
-#ifdef __cpluscplus
-}
-#endif
-
 #endif

diff --git a/libs/spandisc/src/logic.h b/libs/spandisc/src/logic.h
index aab4f82b4f08ba5767ea4c6bc7848bf5083fe20e..c002fd7ac47fbde7e46dc5554b8f6ea9b7642507 100644 (file)
--- a/libs/spandisc/src/logic.h
+++ b/libs/spandisc/src/logic.h
@@ -1,35 +1,10 @@
 #ifndef _LOGIC_H
 #define _LOGIC_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-const char *get_version();
-
-/**
- * Event pointer to method execute by the writing file.
- * This Method is called by span
- *
- * @param output is the file name
- * @param disc is the disc struct
- */
 typedef void (*status_print_t)(const char *output, medium_t* disc);
 extern status_print_t status_print;
 
-/**
- * Split file pathes from input file with split size into seperated
- * output files. Output files contains the pathes fit on a media. Output files
- * name generate with output prefix and four digit number.
- *
- * @param input path to the input text file
- * @param output prefix of output files
- * @param split size to split in bytes
- */
+const char *get_version();
 void span(const char *input, const char *output, unsigned long long split);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

diff --git a/libs/spandisc/src/spandisc.h b/libs/spandisc/src/spandisc.h
index a93be5d5f721a2b9509c176b6568932126fd4a04..10486c396bd9e82cdfbec448f1ffc655c55665eb 100644 (file)
--- a/libs/spandisc/src/spandisc.h
+++ b/libs/spandisc/src/spandisc.h
@@ -1,10 +1,6 @@
 #ifndef _SPANDISC_H
 #define _SPANDISC_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct {
        char* name;
        unsigned long long fsize;
@@ -28,8 +24,4 @@ medium_t* init_medium();
 void free_medium(medium_t *medium);
 void free_collection(collection_t *col);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

diff --git a/libs/spandisc/src/splitter.c b/libs/spandisc/src/splitter.c
index 927743d689f3ad36f06f99ca379b5e2b059a6d83..9a6202cc2102c23b47a9991062d4235a545ad108 100644 (file)
--- a/libs/spandisc/src/splitter.c
+++ b/libs/spandisc/src/splitter.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "spandisc.h"
+
 #include "splitter.h"
 
 #define S_IFREG 0100000 // bitmask for regular file; man inode

diff --git a/libs/spandisc/src/splitter.h b/libs/spandisc/src/splitter.h
index 2b803ad0f6ab3624ad3ee5dd9c3ce384ab5575d7..e4aa092d55c91ed105d766ec4642a84c869b7c2e 100644 (file)
--- a/libs/spandisc/src/splitter.h
+++ b/libs/spandisc/src/splitter.h
@@ -1,16 +1,10 @@
 #ifndef _SPLITTER_H
 #define _SPLITTER_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "spandisc.h"
 
 medium_t* splitter(medium_t *srcdata);
 medium_t* ignore(medium_t *srcdata);
 void split_all(medium_t *srcdata, collection_t* col);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

diff --git a/src/discspan.c b/src/discspan.c
index d092b3f704c5963ca16aa62563f0028ebd314c94..992993db096c366277c4dae5ede3c657f71ad70a 100644 (file)
--- a/src/discspan.c
+++ b/src/discspan.c
@@ -3,8 +3,7 @@
 #include <unistd.h>
 
 #include "config_discspan.h"
-#include "spandisc.h"
-#include "logic.h"
+#include "libspandisc.h"
 #include "help.h"
 
 typedef struct {