From 304b9495ad21b83b8b99948c12e27da27f7ff6e6 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sun, 31 Aug 2025 17:44:49 +0200 Subject: [PATCH] change headers only c --- libs/spandisc/src/config_spandisc.h.in | 8 -------- libs/spandisc/src/filehandler.c | 1 - libs/spandisc/src/filehandler.h | 21 +------------------- libs/spandisc/src/libspandisc.h | 12 ------------ libs/spandisc/src/logic.h | 27 +------------------------- libs/spandisc/src/spandisc.h | 8 -------- libs/spandisc/src/splitter.c | 2 +- libs/spandisc/src/splitter.h | 8 +------- src/discspan.c | 3 +-- 9 files changed, 5 insertions(+), 85 deletions(-) diff --git a/libs/spandisc/src/config_spandisc.h.in b/libs/spandisc/src/config_spandisc.h.in index c02de9a..e4f5209 100644 --- 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 0d91436..437e97a 100644 --- a/libs/spandisc/src/filehandler.c +++ b/libs/spandisc/src/filehandler.c @@ -3,7 +3,6 @@ #include #include -#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 b720d1c..21cada6 100644 --- 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 443ed1e..13396f1 100644 --- 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 aab4f82..c002fd7 100644 --- 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 a93be5d..10486c3 100644 --- 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 927743d..9a6202c 100644 --- a/libs/spandisc/src/splitter.c +++ b/libs/spandisc/src/splitter.c @@ -2,7 +2,7 @@ #include #include -#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 2b803ad..e4aa092 100644 --- 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 d092b3f..992993d 100644 --- a/src/discspan.c +++ b/src/discspan.c @@ -3,8 +3,7 @@ #include #include "config_discspan.h" -#include "spandisc.h" -#include "logic.h" +#include "libspandisc.h" #include "help.h" typedef struct { -- 2.47.3