From 6048724f22106f39d8be0cd750c4e8a64349676c Mon Sep 17 00:00:00 2001 From: David Ward Date: Tue, 8 Mar 2022 19:00:00 -0500 Subject: [PATCH] coolscan2, coolscan3: Fix initialization of enum members in struct GCC warns when setting an enum member to 0 without an explicit cast. Use the corresponding value in the enum type instead. --- backend/coolscan2.c | 5 ++++- backend/coolscan3.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/backend/coolscan2.c b/backend/coolscan2.c index 429f603b9..641784a8d 100644 --- a/backend/coolscan2.c +++ b/backend/coolscan2.c @@ -468,7 +468,10 @@ sane_open (SANE_String_Const name, SANE_Handle * h) for (i_option = 0; i_option < CS2_N_OPTIONS; i_option++) { o.name = o.title = o.desc = NULL; - o.type = o.unit = o.cap = o.constraint_type = o.size = 0; + o.type = SANE_TYPE_BOOL; + o.unit = SANE_UNIT_NONE; + o.size = o.cap = 0; + o.constraint_type = SANE_CONSTRAINT_NONE; o.constraint.range = NULL; /* only one union member needs to be NULLed */ switch (i_option) { diff --git a/backend/coolscan3.c b/backend/coolscan3.c index 3688776cc..77a1a5c64 100644 --- a/backend/coolscan3.c +++ b/backend/coolscan3.c @@ -424,7 +424,10 @@ sane_open(SANE_String_Const name, SANE_Handle * h) for (i_option = 0; i_option < CS3_N_OPTIONS; i_option++) { o.name = o.title = o.desc = NULL; - o.type = o.unit = o.cap = o.constraint_type = o.size = 0; + o.type = SANE_TYPE_BOOL; + o.unit = SANE_UNIT_NONE; + o.size = o.cap = 0; + o.constraint_type = SANE_CONSTRAINT_NONE; o.constraint.range = NULL; /* only one union member needs to be NULLed */ switch (i_option) { case CS3_OPTION_NUM: