summaryrefslogtreecommitdiff
path: root/backend/hp3900_config.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-02-12 17:36:29 +0100
committerJörg Frings-Fürst <debian@jff.email>2023-02-12 17:36:29 +0100
commit882fd010527b8d8823f09e19edbed3746265fa08 (patch)
treebe5c7cace6697afc753c152d13ad5145d0884a42 /backend/hp3900_config.c
parent527bedac30eb120915718eb7997e6dacd583512e (diff)
parente0d94cf4d39395df1e2c6bb4d967200298c13881 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/hp3900_config.c')
-rw-r--r--backend/hp3900_config.c78
1 files changed, 33 insertions, 45 deletions
diff --git a/backend/hp3900_config.c b/backend/hp3900_config.c
index daeb583..c40920f 100644
--- a/backend/hp3900_config.c
+++ b/backend/hp3900_config.c
@@ -1523,19 +1523,16 @@ static SANE_Int hp3800_checkstable(SANE_Int lamp, struct st_checkstable *check)
SANE_Int rst = ERROR;
- if (reg != NULL)
- {
- SANE_Int a;
- SANE_Int count = sizeof(reg) / sizeof(struct st_reg);
+ SANE_Int a;
+ SANE_Int count = sizeof(reg) / sizeof(struct st_reg);
- for (a = 0; a < count; a++)
+ for (a = 0; a < count; a++)
+ {
+ if (reg[a].lamp == lamp)
{
- if (reg[a].lamp == lamp)
- {
- memcpy(check, &reg[a].values, sizeof(struct st_checkstable));
- rst = OK;
- break;
- }
+ memcpy(check, &reg[a].values, sizeof(struct st_checkstable));
+ rst = OK;
+ break;
}
}
@@ -1560,19 +1557,16 @@ static SANE_Int hp3970_checkstable(SANE_Int lamp, struct st_checkstable *check)
SANE_Int rst = ERROR;
- if (reg != NULL)
- {
- SANE_Int a;
- SANE_Int count = sizeof(reg) / sizeof(struct st_reg);
+ SANE_Int a;
+ SANE_Int count = sizeof(reg) / sizeof(struct st_reg);
- for (a = 0; a < count; a++)
+ for (a = 0; a < count; a++)
+ {
+ if (reg[a].lamp == lamp)
{
- if (reg[a].lamp == lamp)
- {
- memcpy(check, &reg[a].values, sizeof(struct st_checkstable));
- rst = OK;
- break;
- }
+ memcpy(check, &reg[a].values, sizeof(struct st_checkstable));
+ rst = OK;
+ break;
}
}
@@ -1597,19 +1591,16 @@ static SANE_Int hp4370_checkstable(SANE_Int lamp, struct st_checkstable *check)
SANE_Int rst = ERROR;
- if (reg != NULL)
- {
- SANE_Int a;
- SANE_Int count = sizeof(reg) / sizeof(struct st_reg);
+ SANE_Int a;
+ SANE_Int count = sizeof(reg) / sizeof(struct st_reg);
- for (a = 0; a < count; a++)
+ for (a = 0; a < count; a++)
+ {
+ if (reg[a].lamp == lamp)
{
- if (reg[a].lamp == lamp)
- {
- memcpy(check, &reg[a].values, sizeof(struct st_checkstable));
- rst = OK;
- break;
- }
+ memcpy(check, &reg[a].values, sizeof(struct st_checkstable));
+ rst = OK;
+ break;
}
}
@@ -1634,19 +1625,16 @@ static SANE_Int ua4900_checkstable(SANE_Int lamp, struct st_checkstable *check)
SANE_Int rst = ERROR;
- if (reg != NULL)
- {
- SANE_Int a;
- SANE_Int count = sizeof(reg) / sizeof(struct st_reg);
+ SANE_Int a;
+ SANE_Int count = sizeof(reg) / sizeof(struct st_reg);
- for (a = 0; a < count; a++)
+ for (a = 0; a < count; a++)
+ {
+ if (reg[a].lamp == lamp)
{
- if (reg[a].lamp == lamp)
- {
- memcpy(check, &reg[a].values, sizeof(struct st_checkstable));
- rst = OK;
- break;
- }
+ memcpy(check, &reg[a].values, sizeof(struct st_checkstable));
+ rst = OK;
+ break;
}
}
@@ -2719,7 +2707,7 @@ static SANE_Int bq5550_scanmodes(SANE_Int usb, SANE_Int sm, struct st_scanmode *
SANE_Int rst = ERROR;
/* silence compiler */
- usb = usb;
+ (void) usb;
if (mymode != NULL)
{