summaryrefslogtreecommitdiff
path: root/backend/gt68xx.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-02-01 15:26:02 +0100
committerJörg Frings-Fürst <debian@jff.email>2022-02-01 15:26:02 +0100
commit5de81480e84023d91763d89e4523de88df42c194 (patch)
treecb83e4c8216cf0e8bcaa17a6f2cb64cf4d7f469a /backend/gt68xx.c
parent97e55bdc5cdf59304af739e65f416320bcbcf599 (diff)
parent8e5d399808d2270ae9d56c96560a021e594d18a4 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/gt68xx.c')
-rw-r--r--backend/gt68xx.c26
1 files changed, 17 insertions, 9 deletions
diff --git a/backend/gt68xx.c b/backend/gt68xx.c
index 6e43765..f46c578 100644
--- a/backend/gt68xx.c
+++ b/backend/gt68xx.c
@@ -1174,8 +1174,11 @@ static SANE_Status probe_gt68xx_devices(void)
new_dev[i]->model->firmware_name);
}
if (i == 0)
- DBG (5, "sane_init: firmware %s can't be loaded, set device "
- "first\n", word);
+ {
+ DBG (5, "sane_init: firmware %s can't be loaded, set device "
+ "first\n", word);
+ free (word);
+ }
}
else
{
@@ -1198,8 +1201,11 @@ static SANE_Status probe_gt68xx_devices(void)
new_dev[i]->model->name, new_dev[i]->model->vendor);
}
if (i == 0)
- DBG (5, "sane_init: can't set vendor name %s, set device "
- "first\n", word);
+ {
+ DBG (5, "sane_init: can't set vendor name %s, set device "
+ "first\n", word);
+ free (word);
+ }
}
else
{
@@ -1221,9 +1227,11 @@ static SANE_Status probe_gt68xx_devices(void)
new_dev[i]->model->name, new_dev[i]->model->model);
}
if (i == 0)
- DBG (5, "sane_init: can't set model name %s, set device "
- "first\n", word);
- free (word);
+ {
+ DBG (5, "sane_init: can't set model name %s, set device "
+ "first\n", word);
+ free (word);
+ }
}
else
{
@@ -1332,10 +1340,10 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
}
#endif
DBG (2, "SANE GT68xx backend version %d.%d build %d from %s\n", SANE_CURRENT_MAJOR,
- V_MINOR, BUILD, PACKAGE_STRING);
+ SANE_CURRENT_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
- *version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
+ *version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
DBG (5, "sane_init: authorize %s null\n", authorize ? "!=" : "==");