From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 5 Jan 2025 13:44:51 +0000 (+0100)
Subject: change device list direct allocate
X-Git-Tag: v1.0.24^2~7
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=bca088449eebff1d5fd81947ec987e18306c0e94;p=sane-kds-s2000w-net.git

change device list direct allocate
---

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 04b7d51..352b263 100644
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -9,18 +9,6 @@
 #include "kds_s2000w_handler.h"
 #include "kds_s2000w_debug.h"
 
-SANE_Device** device_info_list = NULL;
-
-void _free_device_info_list()
-{
-	free(device_info_list[0]);
-	device_info_list[0] = NULL;
-	free(device_info_list[1]);
-	device_info_list[1] = NULL;
-	free(device_info_list);
-	device_info_list = NULL;
-}
-
 SANE_Status _sane_kds_s2000w_net_init(SANE_Int* version_code, SANE_Auth_Callback authorize)
 {
 	debug_printf(ALL, "sane_kds_s2000w_net_init");
@@ -32,7 +20,6 @@ SANE_Status _sane_kds_s2000w_net_init(SANE_Int* version_code, SANE_Auth_Callback
 
 void _sane_kds_s2000w_net_exit(void)
 {
-	_free_device_info_list();
 	debug_printf(ALL, "sane_kds_s2000w_net_exit");
 }
 
@@ -44,14 +31,12 @@ SANE_Status _sane_kds_s2000w_net_get_devices(SANE_Device*** device_list,
 	if (local_only)
 		return SANE_STATUS_NO_MEM;
 
-	device_info_list = malloc(sizeof(SANE_Device*) * 2);
-	device_info_list[0] = malloc(sizeof(SANE_Device));
-	device_info_list[0]->name = "kds_s2000w_net";
-	device_info_list[0]->vendor = "Kodak";
-	device_info_list[0]->model = "Kodak Alaris s2000w series";
-	device_info_list[0]->type = "sheetfed scanner";
-	device_info_list[1] = NULL;
-	*device_list = device_info_list;
+	device_list[0] = malloc(sizeof(SANE_Device*));
+	device_list[0][0] = 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";
 
 	return SANE_STATUS_GOOD;
 }