From 4ed0e925587f6df39203f7797ae94e8a106c5cf8 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Wed, 19 Nov 2025 20:20:33 +0100 Subject: [PATCH] change rename global device info var --- src/kds_s2000w_net.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index 599ce4a..3de470c 100644 --- a/src/kds_s2000w_net.c +++ b/src/kds_s2000w_net.c @@ -10,7 +10,7 @@ #define MODEL "Kodak Alaris s2000w series" #define TYPE "sheetfed scanner" -SANE_Device** device_info_ptr = NULL; +SANE_Device** kds_s2000w_device_info_ptr = NULL; SANE_Status sane_kds_s2000w_net_init(SANE_Int* version_code, SANE_Auth_Callback authorize) { @@ -26,13 +26,13 @@ void sane_kds_s2000w_net_exit(void) { kds_s2000w_debug_printf(ALL, "sane_kds_s2000w_net_exit"); - if (device_info_ptr == NULL) + if (kds_s2000w_device_info_ptr == NULL) return; - free(device_info_ptr[0]); - device_info_ptr[0] = NULL; - free(device_info_ptr); - device_info_ptr = NULL; + free(kds_s2000w_device_info_ptr[0]); + kds_s2000w_device_info_ptr[0] = NULL; + free(kds_s2000w_device_info_ptr); + kds_s2000w_device_info_ptr = NULL; } SANE_Status sane_kds_s2000w_net_get_devices(SANE_Device*** device_list, @@ -43,28 +43,28 @@ SANE_Status sane_kds_s2000w_net_get_devices(SANE_Device*** device_list, if (local_only) return SANE_STATUS_NO_MEM; - if (device_info_ptr != NULL) { - *device_list = device_info_ptr; + if (kds_s2000w_device_info_ptr != NULL) { + *device_list = kds_s2000w_device_info_ptr; return SANE_STATUS_GOOD; } - device_info_ptr = malloc(sizeof(SANE_Device*) * 2); - if (device_info_ptr == NULL) + kds_s2000w_device_info_ptr = malloc(sizeof(SANE_Device*) * 2); + if (kds_s2000w_device_info_ptr == NULL) return SANE_STATUS_NO_MEM; - device_info_ptr[0] = malloc(sizeof(SANE_Device)); - if (device_info_ptr[0] == NULL) { - free(device_info_ptr); - device_info_ptr = NULL; + kds_s2000w_device_info_ptr[0] = malloc(sizeof(SANE_Device)); + if (kds_s2000w_device_info_ptr[0] == NULL) { + free(kds_s2000w_device_info_ptr); + kds_s2000w_device_info_ptr = NULL; return SANE_STATUS_NO_MEM; } - device_info_ptr[0]->name = NAME; - device_info_ptr[0]->vendor = VENDOR; - device_info_ptr[0]->model = MODEL; - device_info_ptr[0]->type = TYPE; - device_info_ptr[1] = NULL; - *device_list = device_info_ptr; + kds_s2000w_device_info_ptr[0]->name = NAME; + kds_s2000w_device_info_ptr[0]->vendor = VENDOR; + kds_s2000w_device_info_ptr[0]->model = MODEL; + kds_s2000w_device_info_ptr[0]->type = TYPE; + kds_s2000w_device_info_ptr[1] = NULL; + *device_list = kds_s2000w_device_info_ptr; return SANE_STATUS_GOOD; } -- 2.47.3