From c278b93aec7f81b6291d20e1011b72cb51def55a Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sun, 21 Sep 2025 10:39:55 +0200 Subject: [PATCH] change uniform spelling for ptr --- libs/spandisc/src/filehandler.c | 8 ++++---- libs/spandisc/src/filehandler.h | 4 ++-- libs/spandisc/src/logic.c | 6 +++--- libs/spandisc/src/logic.h | 6 +++--- libs/spandisc/src/splitter.c | 16 ++++++++-------- libs/spandisc/src/splitter.h | 14 +++++++------- src/discspan.c | 4 ++-- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/libs/spandisc/src/filehandler.c b/libs/spandisc/src/filehandler.c index 6364874..6841129 100644 --- a/libs/spandisc/src/filehandler.c +++ b/libs/spandisc/src/filehandler.c @@ -42,18 +42,18 @@ void fill_array_from_file(FILE* in, medium_t* srcdata) path = NULL; } -void read_input_file(const char *input, medium_t *srcdata) +void read_input_file(const char* input, medium_t* srcdata) { - FILE *in = fopen(input, "r"); + FILE* in = fopen(input, "r"); fill_array_from_file(in, srcdata); fclose(in); } -void write_output_file(const char *output, medium_t* disc) +void write_output_file(const char* output, medium_t* disc) { - FILE *out = fopen(output, "w"); + FILE* out = fopen(output, "w"); for (uint32_t i = 0; i < disc->length; i++) { fprintf(out, "%s\n", disc->filearray[i]->name); diff --git a/libs/spandisc/src/filehandler.h b/libs/spandisc/src/filehandler.h index 646ad47..e3c1f3b 100644 --- a/libs/spandisc/src/filehandler.h +++ b/libs/spandisc/src/filehandler.h @@ -3,7 +3,7 @@ #include "splitter.h" -void read_input_file(const char *input, medium_t *srcdata); -void write_output_file(const char *output, medium_t* disc); +void read_input_file(const char* input, medium_t* srcdata); +void write_output_file(const char* output, medium_t* disc); #endif diff --git a/libs/spandisc/src/logic.c b/libs/spandisc/src/logic.c index 2b12fc6..a1f024f 100644 --- a/libs/spandisc/src/logic.c +++ b/libs/spandisc/src/logic.c @@ -12,7 +12,7 @@ status_print_t status_print = NULL; -const char * get_version() +const char* get_version() { return SPANDISC_VERSION; } @@ -22,13 +22,13 @@ void set_status_print(status_print_t status_print_fn) status_print = status_print_fn; } -void on_status_print(const char *output, medium_t* disc) +void on_status_print(const char* output, medium_t* disc) { if (status_print != NULL) status_print(output, disc); } -void span(const char *input, const char *output, uint64_t split) +void span(const char* input, const char* output, uint64_t split) { medium_t* srcdata = init_medium(); srcdata->freespace = split; diff --git a/libs/spandisc/src/logic.h b/libs/spandisc/src/logic.h index 28b56ac..45f5238 100644 --- a/libs/spandisc/src/logic.h +++ b/libs/spandisc/src/logic.h @@ -3,10 +3,10 @@ #include "splitter.h" -typedef void (*status_print_t)(const char *output, medium_t* disc); +typedef void (*status_print_t)(const char* output, medium_t* disc); -const char *get_version(); +const char* get_version(); void set_status_print(status_print_t status_print_fn); -void span(const char *input, const char *output, uint64_t split); +void span(const char* input, const char* output, uint64_t split); #endif diff --git a/libs/spandisc/src/splitter.c b/libs/spandisc/src/splitter.c index 7cc16e3..587cecb 100644 --- a/libs/spandisc/src/splitter.c +++ b/libs/spandisc/src/splitter.c @@ -70,7 +70,7 @@ void free_collection(collection_t *col) col = NULL; } -int cmpfunc(const void *filea, const void *fileb) +int cmpfunc(const void* filea, const void* fileb) { uint64_t a = (*(const file_size_t**)filea)->fsize; uint64_t b = (*(const file_size_t**)fileb)->fsize; @@ -84,7 +84,7 @@ int cmpfunc(const void *filea, const void *fileb) return 0; } -int strcmpfunc(const void *filea, const void *fileb) +int strcmpfunc(const void* filea, const void* fileb) { const char *filename1 = ((const file_size_t*)filea)->name; const char *filename2 = ((const file_size_t*)fileb)->name; @@ -103,7 +103,7 @@ bool can_add_file_to_medium(medium_t *disc, file_size_t *file) return true; } -bool bigger_file_ignore_medium(medium_t *disc, file_size_t *file) +bool bigger_file_ignore_medium(medium_t* disc, file_size_t* file) { uint64_t filesize = ceil(file->fsize / BLOCK_SIZE) * BLOCK_SIZE; @@ -113,7 +113,7 @@ bool bigger_file_ignore_medium(medium_t *disc, file_size_t *file) return disc->freespace < filesize; } -void add_item_medium(medium_t *medium, file_size_t *item) +void add_item_medium(medium_t* medium, file_size_t* item) { medium->filearray = realloc(medium->filearray, (medium->length + 1) * sizeof(file_size_t)); @@ -150,7 +150,7 @@ void add_ignoredisc_to_collection(medium_t* ignoredisc, collection_t* col) col->length++; } -medium_t* splitter_to_disc(medium_t *srcdata, +medium_t* splitter_to_disc(medium_t* srcdata, bool (*check)(medium_t*, file_size_t*)) { qsort(srcdata->filearray, srcdata->length, sizeof(file_size_t*), cmpfunc); @@ -179,17 +179,17 @@ medium_t* splitter_to_disc(medium_t *srcdata, return disc; } -medium_t* splitter(medium_t *srcdata) +medium_t* splitter(medium_t* srcdata) { return splitter_to_disc(srcdata, can_add_file_to_medium); } -medium_t* ignore(medium_t *srcdata) +medium_t* ignore(medium_t* srcdata) { return splitter_to_disc(srcdata, bigger_file_ignore_medium); } -void split_all(medium_t *srcdata, collection_t* col) +void split_all(medium_t* srcdata, collection_t* col) { medium_t* ignoredisc = ignore(srcdata); add_ignoredisc_to_collection(ignoredisc, col); diff --git a/libs/spandisc/src/splitter.h b/libs/spandisc/src/splitter.h index 7fe8613..b9161af 100644 --- a/libs/spandisc/src/splitter.h +++ b/libs/spandisc/src/splitter.h @@ -13,21 +13,21 @@ typedef struct { int16_t nr; uint64_t freespace; uint32_t length; - file_size_t **filearray; + file_size_t** filearray; } medium_t; typedef struct { uint32_t length; - medium_t **disc; + medium_t** disc; } collection_t; collection_t* init_collection(); medium_t* init_medium(); -void free_medium(medium_t *medium); -void free_collection(collection_t *col); +void free_medium(medium_t* medium); +void free_collection(collection_t* col); -medium_t* splitter(medium_t *srcdata); -medium_t* ignore(medium_t *srcdata); -void split_all(medium_t *srcdata, collection_t* col); +medium_t* splitter(medium_t* srcdata); +medium_t* ignore(medium_t* srcdata); +void split_all(medium_t* srcdata, collection_t* col); #endif diff --git a/src/discspan.c b/src/discspan.c index b193709..162234f 100644 --- a/src/discspan.c +++ b/src/discspan.c @@ -19,7 +19,7 @@ void show_version() printf("libspandisc %s\n", get_version()); } -void print_human_read_size(const char *output, medium_t* medium) +void print_human_read_size(const char* output, medium_t* medium) { uint64_t humanread; char einheit[6] = {'B', 'K', 'M', 'G', 'T', 'P'}; @@ -38,7 +38,7 @@ void print_human_read_size(const char *output, medium_t* medium) medium->freespace, humanread, einheit[i]); } -int main(int argc, char *argv[]) +int main(int argc, char* argv[]) { char* input = NULL; char* output = NULL; -- 2.47.3