]> gitweb.hhaalo.de Git - sane-kds-s2000w-net.git/commitdiff
add device direct init in get device
authorBastian Dehn <hhaalo@arcor.de>
Sat, 20 Jan 2024 17:42:43 +0000 (18:42 +0100)
committerBastian Dehn <hhaalo@arcor.de>
Sat, 20 Jan 2024 17:42:43 +0000 (18:42 +0100)
src/kds_s2000w_net.c

index 0c887a3d79a5f0ebeb0343883419c02f6a99728b..f57a59154b4f0d613dd519debe265d1213ba05a8 100644 (file)
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <sane/sane.h>
 
-SANE_Device* device = NULL;
 SANE_Option_Descriptor* optionDescripor = NULL;
 
 SANE_Status _sane_kds_s2000w_net_init(SANE_Int* version_code, SANE_Auth_Callback authorize)
@@ -13,8 +12,6 @@ SANE_Status _sane_kds_s2000w_net_init(SANE_Int* version_code, SANE_Auth_Callback
 
 void _sane_kds_s2000w_net_exit(void)
 {
-       free(device);
-       device = NULL;
        free(optionDescripor);
        optionDescripor = NULL;
        printf("kds_s2000w_net exit\n");
@@ -23,18 +20,17 @@ void _sane_kds_s2000w_net_exit(void)
 SANE_Status _sane_kds_s2000w_net_get_devices(SANE_Device*** device_list,
        SANE_Bool local_only)
 {
-       printf("kds_s2000w_net get devices\n");
        if (local_only) {
                return SANE_STATUS_NO_MEM;
        }
 
-       device = malloc(sizeof(SANE_Device));
-       device->name = "kds_s2000w_net";
-       device->vendor = "Kodak";
-       device->model = "Kodak Alaris s2000w series";
-       device->type = "document scanner";
+       SANE_Device device;
+       device.name = "kds_s2000w_net";
+       device.vendor = "Kodak";
+       device.model = "Kodak Alaris s2000w series";
+       device.type = "document scanner";
 
-       **device_list = device;
+       **device_list = &device;
 
        return SANE_STATUS_GOOD;
 }