From 24edf8000ce0129b92f509dadce6898d2c33f130 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sun, 10 Mar 2024 08:41:16 +0100 Subject: [PATCH] change get device list unchanged local only is true --- src/kds_s2000w_net.c | 9 +++------ tests/kds_s2000w_net_tests.c | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index 76e91d6..3a56198 100644 --- a/src/kds_s2000w_net.c +++ b/src/kds_s2000w_net.c @@ -46,15 +46,12 @@ SANE_Status _sane_kds_s2000w_net_get_devices(SANE_Device*** device_list, { debug_printf(ALL, "sane_kds_s2000w_net_get_devices"); SANE_Device** own_device_list = NULL; - if (local_only) { - own_device_list = malloc(sizeof(SANE_Device*) * 1); - own_device_list[0] = NULL; - *device_list = own_device_list; + SANE_Device* device_info = NULL; + if (local_only) return SANE_STATUS_NO_MEM; - } own_device_list = malloc(sizeof(SANE_Device*) * 2); - SANE_Device* device_info = malloc(sizeof(SANE_Device)); + device_info = malloc(sizeof(SANE_Device)); device_info->name = "kds_s2000w_net"; device_info->vendor = "Kodak"; device_info->model = "Kodak Alaris s2000w series"; diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c index c8c4dde..56d2045 100644 --- a/tests/kds_s2000w_net_tests.c +++ b/tests/kds_s2000w_net_tests.c @@ -55,7 +55,6 @@ START_TEST(kds_s2000w_net_get_devices_only_remote) SANE_Status result = _sane_kds_s2000w_net_get_devices(device_list, 1); ck_assert_int_eq(result, SANE_STATUS_NO_MEM); - ck_assert_ptr_null(device_list[0][0]); free(device_list); device_list = NULL; -- 2.39.5