From cc1b016e766da60ac6a37ab8b5035b5ac66c5988 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 4 Jan 2025 19:38:31 +0100 Subject: [PATCH] Revert "change device list alloc without other variables" This reverts commit 96895d78281a3b6848da9f6a66327b6dba6f782b. --- src/kds_s2000w_net.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index 64f0669..dd57a81 100644 --- a/src/kds_s2000w_net.c +++ b/src/kds_s2000w_net.c @@ -31,14 +31,15 @@ SANE_Status _sane_kds_s2000w_net_get_devices(SANE_Device*** device_list, if (local_only) return SANE_STATUS_NO_MEM; - *device_list = malloc(sizeof(SANE_Device*) * 2); - device_list[0][0] = malloc(sizeof(SANE_Device)); - device_list[0][1] = malloc(sizeof(SANE_Device)); - device_list[0][0][0].name = "kds_s2000w_net"; - device_list[0][0][0].vendor = "Kodak"; - device_list[0][0][0].model = "Kodak Alaris s2000w series"; - device_list[0][0][0].type = "sheetfed scanner"; - device_list[0][1] = NULL; + SANE_Device** own_device_list = malloc(sizeof(SANE_Device*) * 2); + 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"; + device_info->type = "sheetfed scanner"; + own_device_list[0] = device_info; + own_device_list[1] = NULL; + *device_list = own_device_list; return SANE_STATUS_GOOD; } -- 2.39.5