Use __unused__.

merge-requests/1/head
Frank Zago 2004-11-13 19:33:16 +00:00
rodzic 1abeb942c2
commit da05a875bc
5 zmienionych plików z 25 dodań i 88 usunięć

Wyświetl plik

@ -433,15 +433,13 @@ leo_identify_scanner (Leo_Scanner * dev)
/* SCSI sense handler. Callback for SANE. */
static SANE_Status
leo_sense_handler (int scsi_fd, unsigned char *result, void *arg)
leo_sense_handler (int scsi_fd, unsigned char *result, void __unused__ *arg)
{
int asc, ascq, sensekey;
int len;
DBG (DBG_proc, "leo_sense_handler (scsi_fd = %d)\n", scsi_fd);
arg = arg; /* silence gcc */
sensekey = get_RS_sense_key (result);
len = 7 + get_RS_additional_length (result);
@ -1292,7 +1290,7 @@ leo_send_halftone_pattern (Leo_Scanner * dev)
/* Sane entry points */
SANE_Status
sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
sane_init (SANE_Int * version_code, SANE_Auth_Callback __unused__ authorize)
{
FILE *fp;
char dev_name[PATH_MAX];
@ -1302,8 +1300,6 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (DBG_sane_init, "sane_init\n");
authorize = authorize; /* silence gcc */
DBG (DBG_error, "This is sane-leo version %d.%d-%d\n", V_MAJOR,
V_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
@ -1341,15 +1337,13 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
}
SANE_Status
sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
sane_get_devices (const SANE_Device *** device_list, SANE_Bool __unused__ local_only)
{
Leo_Scanner *dev;
int i;
DBG (DBG_proc, "sane_get_devices: enter\n");
local_only = local_only; /* silence gcc */
if (devlist)
free (devlist);
@ -1917,16 +1911,13 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
}
SANE_Status
sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking)
sane_set_io_mode (SANE_Handle __unused__ handle, SANE_Bool __unused__ non_blocking)
{
SANE_Status status;
Leo_Scanner *dev = handle;
DBG (DBG_proc, "sane_set_io_mode: enter\n");
handle = handle; /* silence gcc */
non_blocking = non_blocking; /* silence gcc */
if (!dev->scanning)
{
return SANE_STATUS_INVAL;
@ -1947,13 +1938,10 @@ 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 __unused__ handle, SANE_Int __unused__ * fd)
{
DBG (DBG_proc, "sane_get_select_fd: enter\n");
handle = handle; /* silence gcc */
fd = fd; /* silence gcc */
DBG (DBG_proc, "sane_get_select_fd: exit\n");
return SANE_STATUS_UNSUPPORTED;

Wyświetl plik

@ -840,15 +840,13 @@ get_int_list_index (const SANE_Word list[], const SANE_Word value)
/* SCSI sense handler. Callback for SANE. */
static SANE_Status
matsushita_sense_handler (int scsi_fd, unsigned char *result, void *arg)
matsushita_sense_handler (int scsi_fd, unsigned char *result, void __unused__ *arg)
{
int asc, ascq, sensekey;
int len;
DBG (DBG_proc, "matsushita_sense_handler (scsi_fd = %d)\n", scsi_fd);
arg = arg; /* silence gcc */
sensekey = get_RS_sense_key (result);
len = 7 + get_RS_additional_length (result);
@ -1705,7 +1703,7 @@ do_cancel (Matsushita_Scanner * dev)
/* Entry points */
SANE_Status
sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
sane_init (SANE_Int * version_code, SANE_Auth_Callback __unused__ authorize)
{
FILE *fp;
char dev_name[PATH_MAX];
@ -1715,8 +1713,6 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (DBG_sane_init, "sane_init\n");
authorize = authorize; /* silence gcc */
DBG (DBG_error, "This is sane-matsushita version %d.%d-%d\n", V_MAJOR,
V_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
@ -1754,15 +1750,13 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
}
SANE_Status
sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
sane_get_devices (const SANE_Device *** device_list, SANE_Bool __unused__ local_only)
{
Matsushita_Scanner *dev;
int i;
DBG (DBG_proc, "sane_get_devices: enter\n");
local_only = local_only; /* silence gcc */
if (devlist)
free (devlist);
@ -2418,16 +2412,13 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
}
SANE_Status
sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking)
sane_set_io_mode (SANE_Handle __unused__ handle, SANE_Bool __unused__ non_blocking)
{
SANE_Status status;
Matsushita_Scanner *dev = handle;
DBG (DBG_proc, "sane_set_io_mode: enter\n");
handle = handle; /* silence gcc */
non_blocking = non_blocking; /* silence gcc */
if (dev->scanning == SANE_FALSE)
{
return (SANE_STATUS_INVAL);
@ -2445,13 +2436,10 @@ 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 __unused__ handle, SANE_Int __unused__ * fd)
{
DBG (DBG_proc, "sane_get_select_fd: enter\n");
handle = handle; /* silence gcc */
fd = fd; /* silence gcc */
DBG (DBG_proc, "sane_get_select_fd: exit\n");
return SANE_STATUS_UNSUPPORTED;

Wyświetl plik

@ -521,13 +521,10 @@ sceptre_adjust_raster (Sceptre_Scanner * dev, size_t size_in)
* Since this scanner does not have REQUEST SENSE, it is always an
* error if this function is called.*/
static SANE_Status
sceptre_sense_handler (int scsi_fd, unsigned char *result, void *arg)
sceptre_sense_handler (int scsi_fd, unsigned char __unused__ *result, void __unused__ *arg)
{
DBG (DBG_proc, "sceptre_sense_handler (scsi_fd = %d)\n", scsi_fd);
result = result; /* silence gcc */
arg = arg; /* silence gcc */
return SANE_STATUS_IO_ERROR;
}
@ -1310,7 +1307,7 @@ sceptre_send_gamma (Sceptre_Scanner * dev)
/* Entry points */
SANE_Status
sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
sane_init (SANE_Int * version_code, SANE_Auth_Callback __unused__ authorize)
{
FILE *fp;
char dev_name[PATH_MAX];
@ -1320,8 +1317,6 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (DBG_proc, "sane_init: enter\n");
authorize = authorize; /* silence gcc */
DBG (DBG_error, "This is sane-sceptre version %d.%d-%d\n", V_MAJOR,
V_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
@ -1359,15 +1354,13 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
}
SANE_Status
sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
sane_get_devices (const SANE_Device *** device_list, SANE_Bool __unused__ local_only)
{
Sceptre_Scanner *dev;
int i;
DBG (DBG_proc, "sane_get_devices: enter\n");
local_only = local_only; /* silence gcc */
if (devlist)
free (devlist);
@ -1998,16 +1991,13 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
}
SANE_Status
sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking)
sane_set_io_mode (SANE_Handle __unused__ handle, SANE_Bool __unused__ non_blocking)
{
SANE_Status status;
Sceptre_Scanner *dev = handle;
DBG (DBG_proc, "sane_set_io_mode: enter\n");
handle = handle; /* silence gcc */
non_blocking = non_blocking; /* silence gcc */
if (dev->scanning == SANE_FALSE)
{
return (SANE_STATUS_INVAL);
@ -2028,13 +2018,10 @@ 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 __unused__ handle, SANE_Int __unused__ * fd)
{
DBG (DBG_proc, "sane_get_select_fd: enter\n");
handle = handle; /* silence gcc */
fd = fd; /* silence gcc */
DBG (DBG_proc, "sane_get_select_fd: exit\n");
return SANE_STATUS_UNSUPPORTED;

Wyświetl plik

@ -576,16 +576,13 @@ teco_get_inquiry_82 (Teco_Scanner * dev)
/* SCSI sense handler. Callback for SANE.
* These scanners never set asc or ascq. */
static SANE_Status
teco_sense_handler (int scsi_fd, unsigned char *result, void *arg)
teco_sense_handler (int __unused__ scsi_fd, unsigned char *result, void __unused__ *arg)
{
int sensekey;
int len;
DBG (DBG_proc, "teco_sense_handler: enter\n");
arg = arg; /* silence gcc */
scsi_fd = scsi_fd; /* silence gcc */
sensekey = get_RS_sense_key (result);
len = 7 + get_RS_additional_length (result);
@ -1471,7 +1468,7 @@ do_cancel (Teco_Scanner * dev)
/* Sane entry points */
SANE_Status
sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
sane_init (SANE_Int * version_code, SANE_Auth_Callback __unused__ authorize)
{
FILE *fp;
char dev_name[PATH_MAX];
@ -1481,8 +1478,6 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (DBG_sane_init, "sane_init\n");
authorize = authorize; /* silence gcc */
DBG (DBG_error, "This is sane-teco1 version %d.%d-%d\n", V_MAJOR,
V_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
@ -1520,15 +1515,13 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
}
SANE_Status
sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
sane_get_devices (const SANE_Device *** device_list, SANE_Bool __unused__ local_only)
{
Teco_Scanner *dev;
int i;
DBG (DBG_proc, "sane_get_devices: enter\n");
local_only = local_only; /* silence gcc */
if (devlist)
free (devlist);
@ -2167,16 +2160,13 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
}
SANE_Status
sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking)
sane_set_io_mode (SANE_Handle __unused__ handle, SANE_Bool __unused__ non_blocking)
{
SANE_Status status;
Teco_Scanner *dev = handle;
DBG (DBG_proc, "sane_set_io_mode: enter\n");
handle = handle; /* silence gcc */
non_blocking = non_blocking; /* silence gcc */
if (dev->scanning == SANE_FALSE)
{
return SANE_STATUS_INVAL;
@ -2197,13 +2187,10 @@ 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 __unused__ handle, SANE_Int __unused__ *fd)
{
DBG (DBG_proc, "sane_get_select_fd: enter\n");
handle = handle; /* silence gcc */
fd = fd; /* silence gcc */
DBG (DBG_proc, "sane_get_select_fd: exit\n");
return SANE_STATUS_UNSUPPORTED;

Wyświetl plik

@ -422,16 +422,13 @@ teco_identify_scanner (Teco_Scanner * dev)
/* SCSI sense handler. Callback for SANE.
* These scanners never set asc or ascq. */
static SANE_Status
teco_sense_handler (int scsi_fd, unsigned char *result, void *arg)
teco_sense_handler (int __unused__ scsi_fd, unsigned char *result, void __unused__ *arg)
{
int sensekey;
int len;
DBG (DBG_proc, "teco_sense_handler: enter\n");
arg = arg; /* silence gcc */
scsi_fd = scsi_fd; /* silence gcc */
sensekey = get_RS_sense_key (result);
len = 7 + get_RS_additional_length (result);
@ -1493,7 +1490,7 @@ do_cancel (Teco_Scanner * dev)
/* Sane entry points */
SANE_Status
sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
sane_init (SANE_Int * version_code, SANE_Auth_Callback __unused__ authorize)
{
FILE *fp;
char dev_name[PATH_MAX];
@ -1503,8 +1500,6 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (DBG_sane_init, "sane_init\n");
authorize = authorize; /* silence gcc */
DBG (DBG_error, "This is sane-teco3 version %d.%d-%d\n", V_MAJOR,
V_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
@ -1542,15 +1537,13 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
}
SANE_Status
sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
sane_get_devices (const SANE_Device *** device_list, SANE_Bool __unused__ local_only)
{
Teco_Scanner *dev;
int i;
DBG (DBG_proc, "sane_get_devices: enter\n");
local_only = local_only; /* silence gcc */
if (devlist)
free (devlist);
@ -2159,16 +2152,13 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
}
SANE_Status
sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking)
sane_set_io_mode (SANE_Handle __unused__ handle, SANE_Bool __unused__ non_blocking)
{
SANE_Status status;
Teco_Scanner *dev = handle;
DBG (DBG_proc, "sane_set_io_mode: enter\n");
handle = handle; /* silence gcc */
non_blocking = non_blocking; /* silence gcc */
if (dev->scanning == SANE_FALSE)
{
return SANE_STATUS_INVAL;
@ -2189,13 +2179,10 @@ 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 __unused__ handle, SANE_Int __unused__ * fd)
{
DBG (DBG_proc, "sane_get_select_fd: enter\n");
handle = handle; /* silence gcc */
fd = fd; /* silence gcc */
DBG (DBG_proc, "sane_get_select_fd: exit\n");
return SANE_STATUS_UNSUPPORTED;