From 84357741a6a6e6430f199b2c3f7498e0e97da9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Sun, 12 Feb 2023 17:35:53 +0100
Subject: New upstream version 1.2.1

---
 backend/hp3900_config.c | 78 +++++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 45 deletions(-)

(limited to 'backend/hp3900_config.c')

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)
 	{
-- 
cgit v1.2.3