From e55d3d8ce67892314bc0b19ee52dc9525ed89ce2 Mon Sep 17 00:00:00 2001 From: Ulrich Deiters Date: Thu, 15 Jun 2006 15:55:28 +0000 Subject: [PATCH] Ulrich Deiters: got rid of some compiler warnings --- ChangeLog | 5 +++++ backend/canon-sane.c | 50 +++++++++++++++++++++++++------------------- backend/canon-scsi.c | 6 ++++-- backend/canon.c | 7 ++++--- backend/canon.h | 11 ++++++++-- 5 files changed, 50 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7baee7d20..6e7d96ffc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-15 Ulrich Deiters + + * backend/canon.c, canon.h, canon-scsi.c, canon-sane.c: + got rid of some compiler warnings + 2006-06-14 m. allan noah * backend/fujitsu.c: update to v1.0.32, add 4220c2 usb id diff --git a/backend/canon-sane.c b/backend/canon-sane.c index 332c9d64d..807585cc7 100644 --- a/backend/canon-sane.c +++ b/backend/canon-sane.c @@ -1,5 +1,5 @@ SANE_Status -sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize) +sane_init (SANE_Int * version_code, SANE_Auth_Callback UNUSEDARG authorize) { char devnam[PATH_MAX] = "/dev/scanner"; FILE *fp; @@ -97,7 +97,7 @@ sane_exit (void) next = dev->next; free ((void *) dev->sane.name); free ((void *) dev->sane.model); - free (dev); + free ((void *) dev); } DBG (1, "<< sane_exit\n"); @@ -106,7 +106,8 @@ sane_exit (void) /**************************************************************************/ SANE_Status -sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only) +sane_get_devices (const SANE_Device *** device_list, +SANE_Bool UNUSEDARG local_only) { static const SANE_Device **devlist = 0; CANON_Device *dev; @@ -1249,7 +1250,7 @@ sane_start (SANE_Handle handle) return (SANE_STATUS_INVAL); } for (i = 0; i < buf_size; i++) - DBG (3, "scan mode control byte[%d] = %d\n", i, ebuf[i]); + DBG (3, "scan mode control byte[%d] = %d\n", (int) i, ebuf[i]); if (s->hw->adf.Status != ADF_STAT_NONE) { @@ -1265,7 +1266,8 @@ sane_start (SANE_Handle handle) return (SANE_STATUS_INVAL); } for (i = 0; i < buf_size; i++) - DBG (3, "scan mode control byte[%d] = %d\n", i, ebuf[i]); + DBG (3, "scan mode control byte[%d] = %d\n", (int) i, + ebuf[i]); } mode_str = s->val[OPT_MODE].s; @@ -1524,7 +1526,7 @@ sane_start (SANE_Handle handle) return (SANE_STATUS_INVAL); } for (i = 0; i < buf_size; i++) - DBG (3, "scan mode byte[%d] = %d\n", i, ebuf[i]); + DBG (3, "scan mode byte[%d] = %d\n", (int) i, ebuf[i]); /* Focus, but not for previews or negatives with speed control */ if (SANE_OPTION_IS_ACTIVE(s->opt[OPT_FOCUS_GROUP].cap) @@ -1690,8 +1692,8 @@ sane_read_direct (SANE_Handle handle, SANE_Byte *buf, SANE_Int max_len, *len = 0; nread = max_len; - DBG (21, " sane_read: nread=%d, bytes_to_read=%d\n", nread, - s->bytes_to_read); + DBG (21, " sane_read: nread=%d, bytes_to_read=%d\n", (int) nread, + (int) s->bytes_to_read); if (s->bytes_to_read == 0) { do_cancel (s); @@ -1710,8 +1712,8 @@ sane_read_direct (SANE_Handle handle, SANE_Byte *buf, SANE_Int max_len, *len = nread; s->bytes_to_read -= nread; - DBG (21, " sane_read: nread=%d, bytes_to_read=%d\n", nread, - s->bytes_to_read); + DBG (21, " sane_read: nread=%d, bytes_to_read=%d\n", (int) nread, + (int) s->bytes_to_read); DBG (21, "<< sane_read\n"); return (SANE_STATUS_GOOD); } @@ -1727,17 +1729,17 @@ read_fs2710 (SANE_Handle handle, SANE_Byte *buf, SANE_Int max_len, int c; size_t i, nread, nread2; u_char *p; -#if defined(WORDS_BIGENDIAN) + #if defined(WORDS_BIGENDIAN) u_char b; -#endif + #endif DBG (21, ">> sane_read\n"); *len = 0; nread = max_len; - DBG (21, " sane_read: nread=%d, bytes_to_read=%d\n", nread, - s->bytes_to_read); + DBG (21, " sane_read: nread=%d, bytes_to_read=%d\n", (int) nread, + (int) s->bytes_to_read); if (nread > s->bytes_to_read) nread = s->bytes_to_read; if (s->bytes_to_read == 0) @@ -1803,8 +1805,8 @@ read_fs2710 (SANE_Handle handle, SANE_Byte *buf, SANE_Int max_len, *len = nread; s->bytes_to_read -= nread; - DBG (21, " sane_read: nread=%d, bytes_to_read=%d\n", nread, - s->bytes_to_read); + DBG (21, " sane_read: nread=%d, bytes_to_read=%d\n", (int) nread, + (int) s->bytes_to_read); DBG (21, "<< sane_read\n"); return (SANE_STATUS_GOOD); } @@ -1826,8 +1828,8 @@ read_fb620 (SANE_Handle handle, SANE_Byte *buf, SANE_Int max_len, *len = 0; - DBG (21, " read_fb620: nread=%d, bytes_to_read=%d\n", nread, - s->bytes_to_read); + DBG (21, " read_fb620: nread=%d, bytes_to_read=%d\n", (int) nread, + (int) s->bytes_to_read); if (s->bytes_to_read == 0 && s->buf_pos == s->buf_used) { @@ -1952,12 +1954,14 @@ SANE_Int *len) + (dbuf[22] << 8) + dbuf[23]); DBG (5, "Filled Data Buffer=%d\n", (dbuf[24] << 24) + (dbuf[25] << 16) + (dbuf[26] << 8) + dbuf[27]); - DBG (5, "temp file position:%u\n", lseek(s->tmpfile, 0, SEEK_CUR)); + DBG (5, "temp file position:%u\n", (unsigned int) lseek(s->tmpfile, + 0, SEEK_CUR)); DBG (5, "<< GET DATA STATUS\n"); *len = 0; - DBG (21, " read_fb1200: bytes_to_read=%d\n", s->bytes_to_read); + DBG (21, " read_fb1200: bytes_to_read=%d\n", + (int) s->bytes_to_read); if (s->bytes_to_read == 0 && s->buf_pos == s->buf_used) { @@ -2207,7 +2211,8 @@ sane_cancel (SANE_Handle handle) /**************************************************************************/ SANE_Status -sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking) +sane_set_io_mode (SANE_Handle UNUSEDARG handle, +SANE_Bool UNUSEDARG non_blocking) { DBG (1, ">> sane_set_io_mode\n"); DBG (1, "<< sane_set_io_mode\n"); @@ -2217,7 +2222,8 @@ sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking) /**************************************************************************/ SANE_Status -sane_get_select_fd (SANE_Handle handle, SANE_Int * fd) +sane_get_select_fd (SANE_Handle UNUSEDARG handle, +SANE_Int UNUSEDARG * fd) { DBG (1, ">> sane_get_select_fd\n"); DBG (1, "<< sane_get_select_fd\n"); diff --git a/backend/canon-scsi.c b/backend/canon-scsi.c index 3bd4efd75..13e01edd8 100644 --- a/backend/canon-scsi.c +++ b/backend/canon-scsi.c @@ -381,10 +381,12 @@ define_scan_mode (int fd, u_char page, void *data) : (page == SCAN_CONTROL_CON_FB1200) ? 19 : 32); for (i = 0; i < sizeof (cmd); i++) - DBG (31, "define scan mode: cmd[%d]='0x%0X'\n", i, cmd[i]); + DBG (31, "define scan mode: cmd[%d]='0x%0X'\n", (int) i, + cmd[i]); for (i = 0; i < sizeof (pdata); i++) - DBG (31, "define scan mode: pdata[%d]='0x%0X'\n", i, pdata[i]); + DBG (31, "define scan mode: pdata[%d]='0x%0X'\n", (int) i, + pdata[i]); pdatalen = (page == TRANSPARENCY_UNIT) ? 12 : (page == TRANSPARENCY_UNIT_FB1200) ? 14 diff --git a/backend/canon.c b/backend/canon.c index cb704efbe..2a1470e39 100644 --- a/backend/canon.c +++ b/backend/canon.c @@ -241,7 +241,7 @@ get_tpu_stat (int fd, CANON_Device * dev) } for (i = 0; i < buf_size; i++) - DBG (3, "scan mode control byte[%d] = %d\n", i, tbuf[i]); + DBG (3, "scan mode control byte[%d] = %d\n", (int) i, tbuf[i]); dev->tpu.Status = (tbuf[2 + 4 + 5] >> 7) ? TPU_STAT_INACTIVE : TPU_STAT_NONE; if (dev->tpu.Status == SANE_TRUE) /* TPU available */ @@ -286,7 +286,7 @@ get_adf_stat (int fd, CANON_Device * dev) } for (i = 0; i < buf_size; i++) - DBG (3, "scan mode control byte[%d] = %d\n", i, abuf[i]); + DBG (3, "scan mode control byte[%d] = %d\n", (int) i, abuf[i]); dev->adf.Status = (abuf[ADF_Status] & ADF_NOT_PRESENT) ? ADF_STAT_NONE : ADF_STAT_INACTIVE; @@ -330,6 +330,7 @@ sense_handler (int scsi_fd, u_char * result, void *arg) result[9], result[10], result[11], result[12], result[13], result[14], result[15]); + status = SANE_STATUS_GOOD; if (dev && dev->info.is_scsi2) { DBG(11, "sense data interpretation for SCSI-2 devices\n"); @@ -750,7 +751,7 @@ attach (const char *devnam, CANON_Device ** devp) } for (i = 0; i < buf_size; i++) { - DBG (3, "scan mode byte[%d] = %d\n", i, ebuf[i]); + DBG (3, "scan mode byte[%d] = %d\n", (int) i, ebuf[i]); } DBG (3, "attach: sending (extended) INQUIRY\n"); diff --git a/backend/canon.h b/backend/canon.h index 88a084546..b61823d96 100644 --- a/backend/canon.h +++ b/backend/canon.h @@ -1,8 +1,9 @@ /* sane - Scanner Access Now Easy. Copyright (C) 1997 BYTEC GmbH Germany Written by Helmut Koeberle, Email: helmut.koeberle@bytec.de - Modified by Manuel Panea - and Markus Mertinat + Modified by Manuel Panea , + Markus Mertinat , + and ULrich Deiters This file is part of the SANE package. @@ -45,6 +46,12 @@ #ifndef canon_h #define canon_h 1 +#ifdef __GNUC__ +#define UNUSEDARG __attribute__ ((unused)) +#else +#define UNUSEDARG +#endif + /* all the different possible model names. */ #define FB1200S "IX-12015E " #define FB620S "IX-06035E "