]> gitweb.hhaalo.de Git - sane-kds-s2000w-net.git/commitdiff
fix compiler warnings
authorBastian Dehn <hhaalo@arcor.de>
Tue, 12 Mar 2024 17:07:37 +0000 (18:07 +0100)
committerBastian Dehn <hhaalo@arcor.de>
Tue, 12 Mar 2024 17:07:37 +0000 (18:07 +0100)
CMakeLists.txt
src/kds_s2000w_config.c
src/kds_s2000w_image_converter.c
src/kds_s2000w_image_converter.h
tests/kds_s2000w_net_read_tests.c

index 4a39fcd4a24d3d17889542abf56e68f4c5683924..7fef4a23f5eda21ef89439a3b5d8827bf284ac76 100644 (file)
@@ -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")
 
index 505b86706f0a5f89539281ce95fe16ab6929a2a5..2341a3250dae071959b9fd29df0e3e6868fb8326 100644 (file)
@@ -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;
index ecd285eb0242949dc124d13b0771af1af4eb5bb5..c65b5ac55d4fde48fb93688d10ceea6b7809b646 100644 (file)
@@ -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");
index 1c5b1b7b2e90daaef20aa33c686c306180728b4a..b4d64e01ee8c3c7cd6056a0c82e31c9ee94d3d63 100644 (file)
@@ -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);
index aacb4f977daf05afa90bfb482eb200abea3c19b1..c1e862dcd33882525042f7c9ffa45ca8cd8eee4d 100644 (file)
@@ -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);