change device list direct allocate

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 04b7d51bb8011993503f1fa09de88b34066f1621..352b263d6b15f32b217ae65cfc8b8345f2d4f21f 100644 (file)
--- 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;
 }