From 9b1d253ca30a78961af1583809e731bb1acfc283 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Tue, 12 Mar 2024 18:07:37 +0100 Subject: [PATCH] fix compiler warnings --- CMakeLists.txt | 1 + src/kds_s2000w_config.c | 3 +-- src/kds_s2000w_image_converter.c | 6 ------ src/kds_s2000w_image_converter.h | 1 - tests/kds_s2000w_net_read_tests.c | 10 +++++----- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a39fcd..7fef4a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.25.1) set(CMAKE_C_COMPILER gcc CACHE STRING "compiler") +set(CMAKE_C_FLAGS "-Wall" CACHE STRING "compiler flags") project("kds_s2000w_net" VERSION "0.0.1") diff --git a/src/kds_s2000w_config.c b/src/kds_s2000w_config.c index 505b867..2341a32 100644 --- a/src/kds_s2000w_config.c +++ b/src/kds_s2000w_config.c @@ -37,7 +37,6 @@ void load_config(program_config* config, const char* config_stream) cfg_t* cfg = NULL; char* value_str = NULL; size_t str_length = 0; - int status = 0; if (strlen(config_stream) <= 0) { return; @@ -51,7 +50,7 @@ void load_config(program_config* config, const char* config_stream) cfg = cfg_init(opts, 0); - status = cfg_parse_buf(cfg, config_stream); + cfg_parse_buf(cfg, config_stream); value_str = cfg_getstr(cfg, "scanner_url"); str_length = strlen(value_str) + 1; diff --git a/src/kds_s2000w_image_converter.c b/src/kds_s2000w_image_converter.c index ecd285e..c65b5ac 100644 --- a/src/kds_s2000w_image_converter.c +++ b/src/kds_s2000w_image_converter.c @@ -7,12 +7,6 @@ #include "kds_s2000w_image_converter.h" #include "kds_s2000w_debug.h" -void kds_s2000w_convert_init() -{ - debug_printf(ALL, "kds_s2000w_convert_init"); - IsMagickCoreInstantiated(); -} - void kds_s2000w_convert_terminate() { debug_printf(ALL, "kds_s2000w_convert_terminate"); diff --git a/src/kds_s2000w_image_converter.h b/src/kds_s2000w_image_converter.h index 1c5b1b7..b4d64e0 100644 --- a/src/kds_s2000w_image_converter.h +++ b/src/kds_s2000w_image_converter.h @@ -6,7 +6,6 @@ typedef struct { void* data; } blobdata; -void kds_s2000w_convert_init(); void kds_s2000w_convert_terminate(); void kds_s2000w_convert_jpg_to_pnm(blobdata* in, blobdata* out); diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c index aacb4f9..c1e862d 100644 --- a/tests/kds_s2000w_net_read_tests.c +++ b/tests/kds_s2000w_net_read_tests.c @@ -29,7 +29,7 @@ START_TEST(sane_kds_s2000w_net_read_without_data) handler* h = init_handler(); char* dataptr = malloc(sizeof(char)); - SANE_Status status = _sane_kds_s2000w_net_read(h, dataptr, 65536, &length); + SANE_Status status = _sane_kds_s2000w_net_read(h, (void*) dataptr, 65536, &length); ck_assert_int_eq(status, SANE_STATUS_EOF); @@ -48,7 +48,7 @@ START_TEST(sane_kds_s2000w_net_read_empty_image) h->pnm_image->size = 0; char* dataptr = malloc(sizeof(char)); - SANE_Status status = _sane_kds_s2000w_net_read(h, dataptr, 65536, &length); + SANE_Status status = _sane_kds_s2000w_net_read(h, (void*) dataptr, 65536, &length); ck_assert_int_eq(status, SANE_STATUS_EOF); @@ -77,7 +77,7 @@ START_TEST(sane_kds_s2000w_net_read_test) char* dataptr = malloc(sizeof(char) * maxlen); SANE_Int* length = malloc(sizeof(SANE_Int)); - _sane_kds_s2000w_net_read(h, dataptr, maxlen, length); + _sane_kds_s2000w_net_read(h, (void*) dataptr, maxlen, length); ck_assert_int_eq(*length, 65536); ck_assert_mem_eq(dataptr, h->pnm_image->data + 3, 65536); @@ -111,8 +111,8 @@ START_TEST(sane_kds_s2000w_net_read_bytes_per_line_bigger_test) char* dataptr = malloc(sizeof(char) * maxlen); SANE_Int* length = malloc(sizeof(SANE_Int)); - _sane_kds_s2000w_net_read(h, dataptr, maxlen, length); - _sane_kds_s2000w_net_read(h, dataptr, maxlen, length); + _sane_kds_s2000w_net_read(h, (void*) dataptr, maxlen, length); + _sane_kds_s2000w_net_read(h, (void*) dataptr, maxlen, length); ck_assert_int_eq(h->read_info->read_size, 95003); -- 2.39.5