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

Fix incompatible pointer type warning

merge-requests/1/head
Mattias Ellert 2008-02-03 07:47:55 +00:00
rodzic 22efa538b7
commit e13bee7577
2 zmienionych plików z 12 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
ChangeLog
Wyświetl plik

@ -1,7 +1,8 @@
2008-02-03 Mattias Ellert <mattias.ellert@tsl.uu.se> 2008-02-03 Mattias Ellert <mattias.ellert@tsl.uu.se>
* Makefile.in, */Makefile.in, tools/sane-config.in : * Makefile.in, */Makefile.in, tools/sane-config.in:
Fix warnings about ignored --datarootdir Fix warnings about ignored --datarootdir
* backend/hp5590_low.c: Fix incompatible pointer type warning
2008-02-02 Mattias Ellert <mattias.ellert@tsl.uu.se> 2008-02-02 Mattias Ellert <mattias.ellert@tsl.uu.se>

20
backend/hp5590_low.c
Wyświetl plik

@ -637,7 +637,7 @@ hp5590_bulk_read (SANE_Int dn, unsigned char *bytes, unsigned int size,
SANE_Status ret; SANE_Status ret;
unsigned int next_pages; unsigned int next_pages;
u_int8_t bulk_flags; u_int8_t bulk_flags;
unsigned int next_portion; size_t next_portion;
struct bulk_read_state *bulk_read_state; struct bulk_read_state *bulk_read_state;
unsigned int bytes_until_buffer_end; unsigned int bytes_until_buffer_end;
@ -755,8 +755,8 @@ hp5590_bulk_read (SANE_Int dn, unsigned char *bytes, unsigned int size,
} }
/* Bulk read next page */ /* Bulk read next page */
DBG (DBG_usb, "%s: USB-in-USB: bulk reading %u bytes\n", DBG (DBG_usb, "%s: USB-in-USB: bulk reading %lu bytes\n",
__FUNCTION__, next_portion); __FUNCTION__, (u_long) next_portion);
ret = sanei_usb_read_bulk (dn, ret = sanei_usb_read_bulk (dn,
bulk_read_state->buffer_in_ptr, bulk_read_state->buffer_in_ptr,
&next_portion); &next_portion);
@ -773,8 +773,8 @@ hp5590_bulk_read (SANE_Int dn, unsigned char *bytes, unsigned int size,
if (next_portion != BULK_READ_PAGE_SIZE) if (next_portion != BULK_READ_PAGE_SIZE)
{ {
DBG (DBG_err, "%s: USB-in-USB: incomplete bulk read " DBG (DBG_err, "%s: USB-in-USB: incomplete bulk read "
"(requested %u bytes, got %u bytes)\n", "(requested %u bytes, got %lu bytes)\n",
__FUNCTION__, BULK_READ_PAGE_SIZE, next_portion); __FUNCTION__, BULK_READ_PAGE_SIZE, (u_long) next_portion);
return SANE_STATUS_IO_ERROR; return SANE_STATUS_IO_ERROR;
} }
@ -871,7 +871,7 @@ hp5590_bulk_write (SANE_Int dn, int cmd, unsigned char *bytes,
unsigned int len; unsigned int len;
unsigned char *ptr; unsigned char *ptr;
unsigned int next_portion; size_t next_portion;
DBG (3, "%s: USB-in-USB: command: %04x, size %u\n", __FUNCTION__, cmd, DBG (3, "%s: USB-in-USB: command: %04x, size %u\n", __FUNCTION__, cmd,
size); size);
@ -903,8 +903,8 @@ hp5590_bulk_write (SANE_Int dn, int cmd, unsigned char *bytes,
if (len < next_portion) if (len < next_portion)
next_portion = len; next_portion = len;
DBG (3, "%s: USB-in-USB: next portion %u bytes\n", DBG (3, "%s: USB-in-USB: next portion %lu bytes\n",
__FUNCTION__, next_portion); __FUNCTION__, (u_long) next_portion);
/* Prepare bulk write request */ /* Prepare bulk write request */
memset (&ctrl, 0, sizeof (ctrl)); memset (&ctrl, 0, sizeof (ctrl));
@ -927,8 +927,8 @@ hp5590_bulk_write (SANE_Int dn, int cmd, unsigned char *bytes,
return ret; return ret;
/* Write bulk data */ /* Write bulk data */
DBG (3, "%s: USB-in-USB: bulk writing %u bytes\n", DBG (3, "%s: USB-in-USB: bulk writing %lu bytes\n",
__FUNCTION__, next_portion); __FUNCTION__, (u_long) next_portion);
ret = sanei_usb_write_bulk (dn, ptr, &next_portion); ret = sanei_usb_write_bulk (dn, ptr, &next_portion);
if (ret != SANE_STATUS_GOOD) if (ret != SANE_STATUS_GOOD)
{ {