summaryrefslogtreecommitdiff
path: root/sanei/sanei_wire.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-31 17:00:58 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-31 17:00:58 +0200
commitd087d778ffb62e2713cb848540bcc819470365bd (patch)
treed69692a274dd1c7d0672e6bb7155a0fc106f9d49 /sanei/sanei_wire.c
parentc8bd2513ecba169cff44c09c8058c36987357b18 (diff)
parent3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'sanei/sanei_wire.c')
-rw-r--r--sanei/sanei_wire.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/sanei/sanei_wire.c b/sanei/sanei_wire.c
index a43cc2e..32cd1a0 100644
--- a/sanei/sanei_wire.c
+++ b/sanei/sanei_wire.c
@@ -67,7 +67,7 @@ sanei_w_space (Wire * w, size_t howmuch)
if (w->status != 0)
{
- DBG (1, "sanei_w_space: wire is in invalid state %d\n",
+ DBG (1, "sanei_w_space: wire is in invalid state %d\n",
w->status);
return;
}
@@ -81,7 +81,7 @@ sanei_w_space (Wire * w, size_t howmuch)
case WIRE_ENCODE:
nbytes = w->buffer.curr - w->buffer.start;
w->buffer.curr = w->buffer.start;
- DBG (4, "sanei_w_space: ENCODE: sending %lu bytes\n",
+ DBG (4, "sanei_w_space: ENCODE: sending %lu bytes\n",
(u_long) nbytes);
while (nbytes > 0)
{
@@ -184,7 +184,7 @@ sanei_w_array (Wire * w, SANE_Word * len_ptr, void **v,
else
DBG (1, "sanei_w_array: FREE: tried to free array but *len_ptr or *v "
"was NULL\n");
-
+
DBG (4, "sanei_w_array: FREE: done\n");
return;
}
@@ -200,14 +200,14 @@ sanei_w_array (Wire * w, SANE_Word * len_ptr, void **v,
return;
}
DBG (4, "sanei_w_array: array has %d elements\n", len);
-
+
if (w->direction == WIRE_DECODE)
{
*len_ptr = len;
if (len)
{
- if (((unsigned int) len) > MAX_MEM
- || ((unsigned int) len * element_size) > MAX_MEM
+ if (((unsigned int) len) > MAX_MEM
+ || ((unsigned int) len * element_size) > MAX_MEM
|| (w->allocated_memory + len * element_size) > MAX_MEM)
{
DBG (0, "sanei_w_array: DECODE: maximum amount of allocated memory "
@@ -291,7 +291,7 @@ sanei_w_ptr (Wire * w, void **v, WireCodecFunc w_value, size_t value_size)
{
DBG (0, "sanei_w_ptr: DECODE: maximum amount of allocated memory "
"exceeded (limit: %u, new allocation: %lu, total: %lu bytes)\n",
- MAX_MEM, (unsigned long)value_size,
+ MAX_MEM, (unsigned long)value_size,
(unsigned long)(w->allocated_memory + value_size));
w->status = ENOMEM;
return;
@@ -581,8 +581,8 @@ flush (Wire * w)
void
sanei_w_set_dir (Wire * w, WireDirection dir)
{
- DBG (3, "sanei_w_set_dir: wire %d, old direction WIRE_%s\n", w->io.fd,
- w->direction == WIRE_ENCODE ? "ENCODE" :
+ DBG (3, "sanei_w_set_dir: wire %d, old direction WIRE_%s\n", w->io.fd,
+ w->direction == WIRE_ENCODE ? "ENCODE" :
(w->direction == WIRE_DECODE ? "DECODE" : "FREE"));
if (w->direction == WIRE_DECODE && w->buffer.curr != w->buffer.end)
DBG (1, "sanei_w_set_dir: WARNING: will delete %lu bytes from buffer\n",
@@ -591,8 +591,8 @@ sanei_w_set_dir (Wire * w, WireDirection dir)
w->direction = dir;
DBG (4, "sanei_w_set_dir: direction changed\n");
flush (w);
- DBG (3, "sanei_w_set_dir: wire %d, new direction WIRE_%s\n", w->io.fd,
- dir == WIRE_ENCODE ? "ENCODE" :
+ DBG (3, "sanei_w_set_dir: wire %d, new direction WIRE_%s\n", w->io.fd,
+ dir == WIRE_ENCODE ? "ENCODE" :
(dir == WIRE_DECODE ? "DECODE" : "FREE"));
}
@@ -656,13 +656,13 @@ void
sanei_w_init (Wire * w, void (*codec_init_func) (Wire *))
{
DBG_INIT ();
-
+
DBG (3, "sanei_w_init: initializing\n");
w->status = 0;
w->direction = WIRE_ENCODE;
w->buffer.size = 8192;
w->buffer.start = malloc (w->buffer.size);
-
+
if (w->buffer.start == 0)
{
/* Malloc failed, so return an error. */