From 6298e351761bf8c20460aa9f7c8f9f71e87d17f2 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 6 Sep 2025 12:23:06 +0200 Subject: [PATCH] change stdint library --- libs/spandisc/src/filehandler.c | 3 ++- libs/spandisc/src/logic.c | 3 ++- libs/spandisc/src/spandisc.c | 3 ++- libs/spandisc/src/spandisc.h | 12 ++++++------ libs/spandisc/src/splitter.c | 9 +++++---- src/discspan.c | 2 +- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/libs/spandisc/src/filehandler.c b/libs/spandisc/src/filehandler.c index 437e97a..016d8a9 100644 --- a/libs/spandisc/src/filehandler.c +++ b/libs/spandisc/src/filehandler.c @@ -2,6 +2,7 @@ #include #include #include +#include #include "filehandler.h" @@ -46,7 +47,7 @@ void write_output_file(const char *output, medium_t* disc) { FILE *out = fopen(output, "w"); - for (int i = 0; i < disc->length; i++) { + for (uint32_t i = 0; i < disc->length; i++) { fprintf(out, "%s\n", disc->filearray[i]->name); } diff --git a/libs/spandisc/src/logic.c b/libs/spandisc/src/logic.c index 3364439..3ea18ea 100644 --- a/libs/spandisc/src/logic.c +++ b/libs/spandisc/src/logic.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "config_spandisc.h" #include "logic.h" @@ -32,7 +33,7 @@ void span(const char *input, const char *output, unsigned long long split) split_all(srcdata, col); char* outname = malloc(sizeof(char) * (strlen(output) + NUM_LEN)); - for (int i = 0; i < col->length; i++) { + for (uint32_t i = 0; i < col->length; i++) { sprintf(outname, "%s%04d", output, col->disc[i]->nr); on_status_print(outname, col->disc[i]); write_output_file(outname, col->disc[i]); diff --git a/libs/spandisc/src/spandisc.c b/libs/spandisc/src/spandisc.c index a220b6d..1f64f08 100644 --- a/libs/spandisc/src/spandisc.c +++ b/libs/spandisc/src/spandisc.c @@ -1,4 +1,5 @@ #include +#include #include "spandisc.h" collection_t* init_collection() @@ -52,7 +53,7 @@ void free_medium_complete(medium_t* medium) void free_collection(collection_t *col) { - for (int i = 0; i < col->length; i++) { + for (uint32_t i = 0; i < col->length; i++) { free_medium_complete(col->disc[i]); col->disc[i] = NULL; } diff --git a/libs/spandisc/src/spandisc.h b/libs/spandisc/src/spandisc.h index 10486c3..62e2abe 100644 --- a/libs/spandisc/src/spandisc.h +++ b/libs/spandisc/src/spandisc.h @@ -3,19 +3,19 @@ typedef struct { char* name; - unsigned long long fsize; - unsigned int type; + uint64_t fsize; + uint32_t type; } file_size_t; typedef struct { - int nr; - unsigned long long freespace; - int length; + int16_t nr; + uint64_t freespace; + uint32_t length; file_size_t **filearray; } medium_t; typedef struct { - int length; + uint32_t length; medium_t **disc; } collection_t; diff --git a/libs/spandisc/src/splitter.c b/libs/spandisc/src/splitter.c index 30b54d9..414ae50 100644 --- a/libs/spandisc/src/splitter.c +++ b/libs/spandisc/src/splitter.c @@ -2,6 +2,7 @@ #include #include #include +#include #include "splitter.h" @@ -10,8 +11,8 @@ int cmpfunc(const void *filea, const void *fileb) { - unsigned long long a = (*(const file_size_t**)filea)->fsize; - unsigned long long b = (*(const file_size_t**)fileb)->fsize; + uint64_t a = (*(const file_size_t**)filea)->fsize; + uint64_t b = (*(const file_size_t**)fileb)->fsize; if (a < b) return 1; @@ -32,7 +33,7 @@ int strcmpfunc(const void *filea, const void *fileb) bool can_add_file_to_medium(medium_t *disc, file_size_t *file) { - unsigned long long filesize = ceil(file->fsize / BLOCK_SIZE) * BLOCK_SIZE; + uint64_t filesize = ceil(file->fsize / BLOCK_SIZE) * BLOCK_SIZE; if (disc->freespace < filesize) return false; @@ -43,7 +44,7 @@ bool can_add_file_to_medium(medium_t *disc, file_size_t *file) bool bigger_file_ignore_medium(medium_t *disc, file_size_t *file) { - unsigned long long filesize = ceil(file->fsize / BLOCK_SIZE) * BLOCK_SIZE; + uint64_t filesize = ceil(file->fsize / BLOCK_SIZE) * BLOCK_SIZE; if ((file->type & S_IFREG) != S_IFREG) return true; diff --git a/src/discspan.c b/src/discspan.c index 41ef495..e69c166 100644 --- a/src/discspan.c +++ b/src/discspan.c @@ -85,7 +85,7 @@ void print_human_read_size(const char *output, medium_t* medium) if (i > sizeof(einheit)/sizeof(einheit[0])) i = 0; - fprintf(stdout, "free space on %s: %lld bytes (%ld %c)\n", output, + fprintf(stdout, "free space on %s: %ld bytes (%ld %c)\n", output, medium->freespace, humanread, einheit[i]); } -- 2.47.3