From 1e59b7e6a78fdad9de7fb6a57431a596321fb722 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Fri, 17 Oct 2025 19:22:05 +0200 Subject: [PATCH] change rename blobdata type --- src/kds_s2000w_handler.c | 4 ++-- src/kds_s2000w_image_converter.h | 6 +++--- src/kds_s2000w_image_converter_magick.c | 6 +++--- src/kds_s2000w_image_converter_netpbm.c | 18 +++++++++--------- src/kds_s2000w_image_type_check.c | 6 +++--- src/kds_s2000w_image_type_check.h | 6 +++--- tests/kds_s2000w_client_mock.c | 2 +- tests/kds_s2000w_client_mock.h | 4 ++-- tests/kds_s2000w_image_converter_tests.c | 2 +- tests/kds_s2000w_image_type_check_tests.c | 12 ++++++------ 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c index 6c94bd0..90c2184 100644 --- a/src/kds_s2000w_handler.c +++ b/src/kds_s2000w_handler.c @@ -308,13 +308,13 @@ void kds_s2000w_handler_get_current_metadata(handler_t* h, metadata_t* params) image_metadata* mdata = malloc(sizeof(image_metadata)); if (mdata == NULL) return; - blobdata* scanner_image = malloc(sizeof(blobdata)); + blobdata_t* scanner_image = malloc(sizeof(blobdata_t)); if (scanner_image == NULL) { free(mdata); mdata = NULL; return; } - blobdata* image = (blobdata*) h->image; + blobdata_t* image = (blobdata_t*) h->image; scanner_image->data = malloc(sizeof(char) * image->size); if (scanner_image->data == NULL) { free(mdata); diff --git a/src/kds_s2000w_image_converter.h b/src/kds_s2000w_image_converter.h index fbde4fa..5f17e9e 100644 --- a/src/kds_s2000w_image_converter.h +++ b/src/kds_s2000w_image_converter.h @@ -6,7 +6,7 @@ typedef struct { size_t size; void* data; -} blobdata; +} blobdata_t; typedef struct { uint32_t width; @@ -14,7 +14,7 @@ typedef struct { uint8_t depth; } image_metadata; -void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata* image, image_metadata* mdata); -void kds_s2000w_image_converter_to_pnm(blobdata* in, blobdata* out); +void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata_t* image, image_metadata* mdata); +void kds_s2000w_image_converter_to_pnm(blobdata_t* in, blobdata_t* out); #endif \ No newline at end of file diff --git a/src/kds_s2000w_image_converter_magick.c b/src/kds_s2000w_image_converter_magick.c index 0c606f2..e97d3da 100644 --- a/src/kds_s2000w_image_converter_magick.c +++ b/src/kds_s2000w_image_converter_magick.c @@ -16,7 +16,7 @@ #include "kds_s2000w_image_type_check.h" #include "kds_s2000w_debug.h" -void _kds_s2000w_image_converter_to_pnm(blobdata* in, +void _kds_s2000w_image_converter_to_pnm(blobdata_t* in, blobdata* out, const char* format) { @@ -59,7 +59,7 @@ void _kds_s2000w_image_converter_to_pnm(blobdata* in, exception = NULL; } -void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata* image, image_metadata* mdata) +void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata_t* image, image_metadata* mdata) { kds_s2000w_debug_printf(ALL, "kds_s2000w_metadata_from_image"); @@ -86,7 +86,7 @@ void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata* image, ima exception = NULL; } -void kds_s2000w_image_converter_to_pnm(blobdata* in, blobdata* out) +void kds_s2000w_image_converter_to_pnm(blobdata_t* in, blobdata_t* out) { kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_pnm"); diff --git a/src/kds_s2000w_image_converter_netpbm.c b/src/kds_s2000w_image_converter_netpbm.c index 6518e9b..8c75810 100644 --- a/src/kds_s2000w_image_converter_netpbm.c +++ b/src/kds_s2000w_image_converter_netpbm.c @@ -20,7 +20,7 @@ enum imgformat { }; typedef struct { - blobdata* image; + blobdata_t* image; toff_t curr_offset; } tiff_reader; @@ -82,7 +82,7 @@ toff_t _kds_s2000w_image_converter_tiff_size(thandle_t handler) return reader->curr_offset; } -uint32_t _kds_s2000w_image_converter_find_char(const blobdata* image, uint32_t start, const char cfind) +uint32_t _kds_s2000w_image_converter_find_char(const blobdata_t* image, uint32_t start, const char cfind) { kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_find_char"); @@ -113,7 +113,7 @@ uint32_t _kds_s2000w_image_converter_get_number_from_substring(const char* data, return number; } -void _kds_s2000w_image_converter_tiff_metadata(blobdata* image, image_metadata* mdata) +void _kds_s2000w_image_converter_tiff_metadata(blobdata_t* image, image_metadata* mdata) { tiff_reader* tiff_handler = malloc(sizeof(tiff_reader)); if (tiff_handler == NULL) @@ -136,7 +136,7 @@ void _kds_s2000w_image_converter_tiff_metadata(blobdata* image, image_metadata* TIFFClose(tiff); } -void _kds_s2000w_image_converter_pnm_metadata(const blobdata* image, image_metadata* mdata) +void _kds_s2000w_image_converter_pnm_metadata(const blobdata_t* image, image_metadata* mdata) { kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_pnm_metadata"); @@ -154,7 +154,7 @@ void _kds_s2000w_image_converter_pnm_metadata(const blobdata* image, image_metad mdata->height = _kds_s2000w_image_converter_get_number_from_substring(image_data, middle, end); } -void _kds_s2000w_image_converter_jpeg_metadata(blobdata* image, image_metadata* mdata) +void _kds_s2000w_image_converter_jpeg_metadata(blobdata_t* image, image_metadata* mdata) { kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_jpeg_metadata"); @@ -281,7 +281,7 @@ void _kds_s2000w_image_converter_gray_or_color_jpg_to_pnm(j_decompress_ptr cinfo decompress_data = NULL; } -void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata* image, image_metadata* mdata) +void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata_t* image, image_metadata* mdata) { kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_metadata_from_scanner_image"); @@ -304,7 +304,7 @@ void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata* image, ima } } -void _kds_s2000w_image_converter_jpg_to_pnm(blobdata* in, blobdata* out) +void _kds_s2000w_image_converter_jpg_to_pnm(blobdata_t* in, blobdata_t* out) { kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_jpg_to_pnm"); @@ -341,7 +341,7 @@ void _kds_s2000w_image_converter_jpg_to_pnm(blobdata* in, blobdata* out) jpeg_destroy_decompress(&cinfo); } -void _kds_s2000w_image_converter_tiff_to_pnm(blobdata* in, blobdata* out) +void _kds_s2000w_image_converter_tiff_to_pnm(blobdata_t* in, blobdata_t* out) { kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_tiff_to_pnm"); @@ -411,7 +411,7 @@ void _kds_s2000w_image_converter_tiff_to_pnm(blobdata* in, blobdata* out) tiff = NULL; } -void kds_s2000w_image_converter_to_pnm(blobdata* in, blobdata* out) +void kds_s2000w_image_converter_to_pnm(blobdata_t* in, blobdata_t* out) { kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_pnm"); diff --git a/src/kds_s2000w_image_type_check.c b/src/kds_s2000w_image_type_check.c index 5ed1f73..6578227 100644 --- a/src/kds_s2000w_image_type_check.c +++ b/src/kds_s2000w_image_type_check.c @@ -2,7 +2,7 @@ #include "kds_s2000w_debug.h" #include "kds_s2000w_image_type_check.h" -bool kds_s2000w_image_type_check_is_tiff(const blobdata* image) +bool kds_s2000w_image_type_check_is_tiff(const blobdata_t* image) { kds_s2000w_debug_printf(ALL, "kds_s2000w_image_type_check_is_tiff"); @@ -16,7 +16,7 @@ bool kds_s2000w_image_type_check_is_tiff(const blobdata* image) return result && image_data[3] == (char)0x00; } -bool kds_s2000w_image_type_check_is_pnm(const blobdata* image) +bool kds_s2000w_image_type_check_is_pnm(const blobdata_t* image) { kds_s2000w_debug_printf(ALL, "kds_s2000w_image_type_check_is_pnm"); @@ -30,7 +30,7 @@ bool kds_s2000w_image_type_check_is_pnm(const blobdata* image) return strncmp(image_data, "P4", 2) == 0; } -bool kds_s2000w_image_type_check_is_jpeg(const blobdata* image) +bool kds_s2000w_image_type_check_is_jpeg(const blobdata_t* image) { kds_s2000w_debug_printf(ALL, "kds_s2000w_image_type_check_is_jpeg"); diff --git a/src/kds_s2000w_image_type_check.h b/src/kds_s2000w_image_type_check.h index 8cbee0b..40d3734 100644 --- a/src/kds_s2000w_image_type_check.h +++ b/src/kds_s2000w_image_type_check.h @@ -3,8 +3,8 @@ #include #include "kds_s2000w_image_converter.h" -bool kds_s2000w_image_type_check_is_tiff(const blobdata* image); -bool kds_s2000w_image_type_check_is_pnm(const blobdata* image); -bool kds_s2000w_image_type_check_is_jpeg(const blobdata* image); +bool kds_s2000w_image_type_check_is_tiff(const blobdata_t* image); +bool kds_s2000w_image_type_check_is_pnm(const blobdata_t* image); +bool kds_s2000w_image_type_check_is_jpeg(const blobdata_t* image); #endif \ No newline at end of file diff --git a/tests/kds_s2000w_client_mock.c b/tests/kds_s2000w_client_mock.c index aef7626..8836f7e 100644 --- a/tests/kds_s2000w_client_mock.c +++ b/tests/kds_s2000w_client_mock.c @@ -87,7 +87,7 @@ uint8_t __wrap_kds_s2000w_client_set_option(int64_t sessionid, response_t* respo return mock_type(int); } -void __wrap_kds_s2000w_image_converter_to_pnm(blobdata* in, blobdata* out) +void __wrap_kds_s2000w_image_converter_to_pnm(blobdata_t* in, blobdata_t* out) { if (in->data == NULL) return; diff --git a/tests/kds_s2000w_client_mock.h b/tests/kds_s2000w_client_mock.h index 8f7ea04..1f7f131 100644 --- a/tests/kds_s2000w_client_mock.h +++ b/tests/kds_s2000w_client_mock.h @@ -26,6 +26,6 @@ uint8_t __wrap_kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_num uint8_t __wrap_kds_s2000w_client_get_option(int64_t sessionid, response_t* response); uint8_t __wrap_kds_s2000w_client_set_option(int64_t sessionid, response_t* response); -void __wrap_kds_s2000w_convert_jpg_to_pnm_with_depth(blobdata* in, blobdata* out); -void __wrap_kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out); +void __wrap_kds_s2000w_convert_jpg_to_pnm_with_depth(blobdata_t* in, blobdata_t* out); +void __wrap_kds_s2000w_convert_tiff_to_pnm(blobdata_t* in, blobdata_t* out); #endif \ No newline at end of file diff --git a/tests/kds_s2000w_image_converter_tests.c b/tests/kds_s2000w_image_converter_tests.c index 3203269..070f2bd 100644 --- a/tests/kds_s2000w_image_converter_tests.c +++ b/tests/kds_s2000w_image_converter_tests.c @@ -10,7 +10,7 @@ void get_metadata_from_image_test() { - blobdata* image = malloc(sizeof(blobdata)); + blobdata_t* image = malloc(sizeof(blobdata_t)); if (image == NULL) return; image->data = malloc(sizeof(char) * 17); diff --git a/tests/kds_s2000w_image_type_check_tests.c b/tests/kds_s2000w_image_type_check_tests.c index 758a6ca..b64b626 100644 --- a/tests/kds_s2000w_image_type_check_tests.c +++ b/tests/kds_s2000w_image_type_check_tests.c @@ -8,7 +8,7 @@ void kds_s2000w_image_type_check_is_tiff_true_test() { - blobdata* image = malloc(sizeof(blobdata)); + blobdata_t* image = malloc(sizeof(blobdata_t)); if (image == NULL) return; image->data = malloc(sizeof(char) * 4); @@ -38,7 +38,7 @@ void kds_s2000w_image_type_check_is_tiff_true_test() void kds_s2000w_image_type_check_is_tiff_false_test() { - blobdata* image = malloc(sizeof(blobdata)); + blobdata_t* image = malloc(sizeof(blobdata_t)); if (image == NULL) return; @@ -54,7 +54,7 @@ void kds_s2000w_image_type_check_is_tiff_false_test() void kds_s2000w_image_type_check_is_pnm_true_test() { - blobdata* image = malloc(sizeof(blobdata)); + blobdata_t* image = malloc(sizeof(blobdata_t)); if (image == NULL) return; image->size = 2; @@ -80,7 +80,7 @@ void kds_s2000w_image_type_check_is_pnm_true_test() void kds_s2000w_image_type_check_is_pnm_false_test() { - blobdata* image = malloc(sizeof(blobdata)); + blobdata_t* image = malloc(sizeof(blobdata_t)); if (image == NULL) return; image->size = 0; @@ -95,7 +95,7 @@ void kds_s2000w_image_type_check_is_pnm_false_test() void kds_s2000w_image_type_check_is_jpeg_true_test() { - blobdata* image = malloc(sizeof(blobdata)); + blobdata_t* image = malloc(sizeof(blobdata_t)); if (image == NULL) return; image->data = malloc(sizeof(char) * 2); @@ -121,7 +121,7 @@ void kds_s2000w_image_type_check_is_jpeg_true_test() void kds_s2000w_image_type_check_is_jpeg_false_test() { - blobdata* image = malloc(sizeof(blobdata)); + blobdata_t* image = malloc(sizeof(blobdata_t)); if (image == NULL) return; image->size = 0; -- 2.47.3