mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

sanei_wire: updated diag for size_t variables using %zu format 

(u_long) casts sometimes generate incorrect values in diag.
%zu is pretty standard now so we should be using it for size_t args.
666-epsonds-has-issues-with-saned
Ralph Little 2023-02-20 15:25:46 -08:00
rodzic b5058ff5ed
commit 9d26edac5f
1 zmienionych plików z 19 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

38
sanei/sanei_wire.c
Wyświetl plik

@ -57,11 +57,11 @@ sanei_w_space (Wire * w, size_t howmuch)
int fd = w->io.fd; int fd = w->io.fd;
ssize_t nread, nwritten; ssize_t nread, nwritten;
DBG (3, "sanei_w_space: %lu bytes for wire %d\n", (u_long) howmuch, fd); DBG (3, "sanei_w_space: %zu bytes for wire %d\n", howmuch, fd);
if (howmuch > w->buffer.size) if (howmuch > w->buffer.size)
DBG (2, "sanei_w_space: bigger than buffer (%lu bytes), " DBG (2, "sanei_w_space: bigger than buffer (%zu bytes), "
"may be flush()\n", (u_long) w->buffer.size); "may be flush()\n", w->buffer.size);
if (w->status != 0) if (w->status != 0)
{ {
@ -72,15 +72,15 @@ sanei_w_space (Wire * w, size_t howmuch)
if (w->buffer.curr + howmuch > w->buffer.end) if (w->buffer.curr + howmuch > w->buffer.end)
{ {
DBG (4, "sanei_w_space: free buffer size is %lu\n", DBG (4, "sanei_w_space: free buffer size is %zu\n",
(u_long) (w->buffer.end - w->buffer.curr)); (w->buffer.end - w->buffer.curr));
switch (w->direction) switch (w->direction)
{ {
case WIRE_ENCODE: case WIRE_ENCODE:
nbytes = w->buffer.curr - w->buffer.start; nbytes = w->buffer.curr - w->buffer.start;
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 %zu bytes\n",
(u_long) nbytes); nbytes);
while (nbytes > 0) while (nbytes > 0)
{ {
nwritten = (*w->io.write) (fd, w->buffer.curr, nbytes); nwritten = (*w->io.write) (fd, w->buffer.curr, nbytes);
@ -95,8 +95,8 @@ sanei_w_space (Wire * w, size_t howmuch)
} }
w->buffer.curr = w->buffer.start; w->buffer.curr = w->buffer.start;
w->buffer.end = w->buffer.start + w->buffer.size; w->buffer.end = w->buffer.start + w->buffer.size;
DBG (4, "sanei_w_space: ENCODE: free buffer is now %lu\n", DBG (4, "sanei_w_space: ENCODE: free buffer is now %zu\n",
(u_long) w->buffer.size); w->buffer.size);
break; break;
case WIRE_DECODE: case WIRE_DECODE:
@ -110,8 +110,8 @@ sanei_w_space (Wire * w, size_t howmuch)
if (left_over) if (left_over)
{ {
DBG (4, "sanei_w_space: DECODE: %lu bytes left in buffer\n", DBG (4, "sanei_w_space: DECODE: %zu bytes left in buffer\n",
(u_long) left_over); left_over);
memmove (w->buffer.start, w->buffer.curr, left_over); memmove (w->buffer.start, w->buffer.curr, left_over);
} }
w->buffer.curr = w->buffer.start; w->buffer.curr = w->buffer.start;
@ -135,8 +135,8 @@ sanei_w_space (Wire * w, size_t howmuch)
w->buffer.end += nread; w->buffer.end += nread;
} }
while (left_over < howmuch); while (left_over < howmuch);
DBG (4, "sanei_w_space: DECODE: %lu bytes read\n", DBG (4, "sanei_w_space: DECODE: %zu bytes read\n",
(u_long) (w->buffer.end - w->buffer.start)); (size_t)(w->buffer.end - w->buffer.start));
break; break;
case WIRE_FREE: case WIRE_FREE:
@ -161,8 +161,8 @@ sanei_w_array (Wire * w, SANE_Word * len_ptr, void **v,
char *val; char *val;
int i; int i;
DBG (3, "sanei_w_array: wire %d, elements of size %lu\n", w->io.fd, DBG (3, "sanei_w_array: wire %d, elements of size %zu\n", w->io.fd,
(u_long) element_size); element_size);
if (w->direction == WIRE_FREE) if (w->direction == WIRE_FREE)
{ {
@ -250,8 +250,8 @@ sanei_w_ptr (Wire * w, void **v, WireCodecFunc w_value, size_t value_size)
{ {
SANE_Word is_null; SANE_Word is_null;
DBG (3, "sanei_w_ptr: wire %d, value pointer at is %lu bytes\n", w->io.fd, DBG (3, "sanei_w_ptr: wire %d, value pointer at is %zu bytes\n", w->io.fd,
(u_long) value_size); value_size);
if (w->direction == WIRE_FREE) if (w->direction == WIRE_FREE)
{ {
@ -583,8 +583,8 @@ sanei_w_set_dir (Wire * w, WireDirection dir)
w->direction == WIRE_ENCODE ? "ENCODE" : w->direction == WIRE_ENCODE ? "ENCODE" :
(w->direction == WIRE_DECODE ? "DECODE" : "FREE")); (w->direction == WIRE_DECODE ? "DECODE" : "FREE"));
if (w->direction == WIRE_DECODE && w->buffer.curr != w->buffer.end) 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", DBG (1, "sanei_w_set_dir: WARNING: will delete %zu bytes from buffer\n",
(u_long) (w->buffer.end - w->buffer.curr)); (size_t) (w->buffer.end - w->buffer.curr));
flush (w); flush (w);
w->direction = dir; w->direction = dir;
DBG (4, "sanei_w_set_dir: direction changed\n"); DBG (4, "sanei_w_set_dir: direction changed\n");