diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2023-02-16 10:20:08 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2023-02-16 10:20:08 +0100 |
| commit | 778ebf8ee9cb22ea5727844333bcd5a6ee6bc0de (patch) | |
| tree | a754e785b286ed82b45fe4e50b980714ad80e0a7 /backend/dll.c | |
| parent | 7d8aac1f3634dc58785bec7acf097dd6bac8c394 (diff) | |
| parent | 32cb765f681299af226ca0520993cbe47ba5ecd0 (diff) | |
Merge branch 'release/debian/1.2.1-1'debian/1.2.1-1
Diffstat (limited to 'backend/dll.c')
| -rw-r--r-- | backend/dll.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/dll.c b/backend/dll.c index a3233e8..bf34c4f 100644 --- a/backend/dll.c +++ b/backend/dll.c @@ -1068,7 +1068,7 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only) char *full_name; int i, num_devs; size_t len; -#define ASSERT_SPACE(n) \ +#define ASSERT_SPACE(n) do \ { \ if (devlist_len + (n) > devlist_size) \ { \ @@ -1080,7 +1080,7 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only) if (!devlist) \ return SANE_STATUS_NO_MEM; \ } \ - } + } while (0) DBG (3, "sane_get_devices\n"); @@ -1365,7 +1365,7 @@ sane_read (SANE_Handle handle, SANE_Byte * data, SANE_Int max_length, struct meta_scanner *s = handle; DBG (3, "sane_read(handle=%p,data=%p,maxlen=%d,lenp=%p)\n", - handle, data, max_length, (void *) length); + handle, (void *) data, max_length, (void *) length); return (*(op_read_t)s->be->op[OP_READ]) (s->handle, data, max_length, length); } |