diff --git a/ChangeLog b/ChangeLog index 3050a1a44..0c8f0b78c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,15 @@ * doc/descriptions/unsupported.desc: Updated/added several Medion scanners. + * backend/as6e.c backend/coolscan.c backend/dll.c backend/ibm.c + backend/microtek2.c backend/mustek_scsi_pp.c + backend/mustek_usb_high.c backend/mustek_usb_low.c + backend/mustek_usb_mid.c backend/nec.c backend/net.c + backend/qcam.c backend/ricoh-scsi.c backend/s9036.c + backend/sp15c-scsi.h backend/sp15c.c backend/sp15c.h + backend/st400.c backend/tamarack.c backend/tamarack.h + sanei/sanei_scsi.c tools/check-usb-chip.c: Silenced some + compilation warnings. 2003-12-26 Henning Meier-Geinitz diff --git a/backend/as6e.c b/backend/as6e.c index 0a0d85cc2..6a5d77889 100644 --- a/backend/as6e.c +++ b/backend/as6e.c @@ -624,7 +624,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize) FILE *fp = NULL; DBG_INIT (); - DBG (2, "sane_init (authorize = %p)\n", authorize); + DBG (2, "sane_init (authorize = %p)\n", (void *) authorize); if (version_code) *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0); /* fp = sanei_config_open (AS6E_CONFIG_FILE);*/ @@ -933,6 +933,6 @@ sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking) SANE_Status sane_get_select_fd (SANE_Handle handle, SANE_Int * fd) { - DBG (2, "sane_get_select_fd( %p, %p )\n", handle, fd); + DBG (2, "sane_get_select_fd( %p, %p )\n",(void *) handle, (void *) fd); return SANE_STATUS_UNSUPPORTED; } diff --git a/backend/coolscan.c b/backend/coolscan.c index e6b84a4e0..171f1c28f 100644 --- a/backend/coolscan.c +++ b/backend/coolscan.c @@ -1254,7 +1254,7 @@ coolscan_read_data_block (Coolscan_t * s, unsigned int datatype, unsigned int le set_R_xfer_length (sread.cmd, length); r = do_scsi_cmd (s->sfd, sread.cmd, sread.size, s->buffer, length); - return ((r != 0) ? -1 : length); + return ((r != 0) ? -1 : (int) length); } diff --git a/backend/dll.c b/backend/dll.c index c18ce282c..eca2e6eae 100644 --- a/backend/dll.c +++ b/backend/dll.c @@ -1003,7 +1003,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option, DBG (3, "sane_control_option(handle=%p,option=%d,action=%d,value=%p,info=%p)\n", - handle, option, action, value, info); + handle, option, action, value, (void *) info); return (*(op_ctl_option_t)s->be->op[OP_CTL_OPTION]) (s->handle, option, action, value, info); } @@ -1013,7 +1013,7 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params) { struct meta_scanner *s = handle; - DBG (3, "sane_get_parameters(handle=%p,params=%p)\n", handle, params); + DBG (3, "sane_get_parameters(handle=%p,params=%p)\n", handle, (void *) params); return (*(op_get_params_t)s->be->op[OP_GET_PARAMS]) (s->handle, params); } @@ -1033,7 +1033,7 @@ sane_read (SANE_Handle handle, SANE_Byte * data, SANE_Int max_length, struct meta_scanner *s = handle; DBG (3, "sane_read(handle=%p,data=%p,maxlen=%d,lenp=%p)\n", - handle, data, max_length, length); + handle, data, max_length, (void *) length); return (*(op_read_t)s->be->op[OP_READ]) (s->handle, data, max_length, length); } @@ -1061,6 +1061,6 @@ sane_get_select_fd (SANE_Handle handle, SANE_Int * fd) { struct meta_scanner *s = handle; - DBG (3, "sane_get_select_fd(handle=%p,fdp=%p)\n", handle, fd); + DBG (3, "sane_get_select_fd(handle=%p,fdp=%p)\n", handle, (void *) fd); return (*(op_get_select_fd_t)s->be->op[OP_GET_SELECT_FD]) (s->handle, fd); } diff --git a/backend/ibm.c b/backend/ibm.c index a39552a91..005220918 100644 --- a/backend/ibm.c +++ b/backend/ibm.c @@ -539,7 +539,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize) FILE *fp; DBG_INIT (); - DBG (11, ">> sane_init (authorize = %p)\n", authorize); + DBG (11, ">> sane_init (authorize = %p)\n", (void *) authorize); #if defined PACKAGE && defined VERSION DBG (2, "sane_init: ibm backend version %d.%d-%d (" @@ -1176,7 +1176,7 @@ SANE_Status sane_get_select_fd (SANE_Handle handle, SANE_Int * fd) { DBG (5, ">> sane_get_select_fd (handle = %p, fd = %p)\n", - handle, fd); + handle, (void *) fd); DBG (5, "<< sane_get_select_fd\n"); return SANE_STATUS_UNSUPPORTED; diff --git a/backend/microtek2.c b/backend/microtek2.c index d349533f3..a27ae7601 100644 --- a/backend/microtek2.c +++ b/backend/microtek2.c @@ -144,7 +144,7 @@ sane_close (SANE_Handle handle) { Microtek2_Scanner *ms = handle; - DBG(30, "sane_close: ms=%p\n", ms); + DBG(30, "sane_close: ms=%p\n", (void *) ms); if ( ! ms ) return; @@ -162,7 +162,7 @@ sane_close (SANE_Handle handle) ts = ts->next; ts->next = ts->next->next; /* == ms->next */ } - DBG(100, "free ms at %p\n", ms); + DBG(100, "free ms at %p\n", (void *) ms); free((void *) ms); ms = NULL; } @@ -191,7 +191,7 @@ sane_exit (void) if ( md_first_dev->custom_gamma_table[i] ) { DBG(100, "free md_first_dev->custom_gamma_table[%d] at %p\n", - i, md_first_dev->custom_gamma_table[i]); + i, (void *) md_first_dev->custom_gamma_table[i]); free((void *) md_first_dev->custom_gamma_table[i]); md_first_dev->custom_gamma_table[i] = NULL; } @@ -213,7 +213,7 @@ sane_exit (void) md_first_dev->shading_table_d = NULL; } - DBG(100, "free md_first_dev at %p\n", md_first_dev); + DBG(100, "free md_first_dev at %p\n", (void *) md_first_dev); free((void *) md_first_dev); md_first_dev = next; } @@ -244,7 +244,7 @@ sane_get_devices(const SANE_Device ***device_list, SANE_Bool local_only) { if ( sd_list ) { - DBG(100, "free sd_list at %p\n", sd_list); + DBG(100, "free sd_list at %p\n", (void *) sd_list); free(sd_list); sd_list=NULL; } @@ -255,14 +255,14 @@ sane_get_devices(const SANE_Device ***device_list, SANE_Bool local_only) /* first free old list, if there is one; frontend wants a new list */ if ( sd_list ) { - DBG(100, "free sd_list at %p\n", sd_list); + DBG(100, "free sd_list at %p\n", (void *) sd_list); free(sd_list); /* free array of pointers */ } sd_list = (const SANE_Device **) malloc( (md_num_devices + 1) * sizeof(SANE_Device **)); DBG(100, "sane_get_devices: sd_list=%p, malloc'd %d bytes\n", - sd_list, (md_num_devices + 1) * sizeof(SANE_Device **)); + (void *) sd_list, (md_num_devices + 1) * sizeof(SANE_Device **)); if ( ! sd_list ) { @@ -327,7 +327,8 @@ sane_get_parameters(SANE_Handle handle, SANE_Parameters *params) double height_pixel; - DBG(40, "sane_get_parameters: handle=%p, params=%p\n", handle, params); + DBG(40, "sane_get_parameters: handle=%p, params=%p\n", handle, + (void *) params); md = ms->dev; @@ -429,7 +430,7 @@ sane_get_select_fd (SANE_Handle handle, SANE_Int *fd) Microtek2_Scanner *ms = handle; - DBG(30, "sane_get_select_fd: ms=%p\n", ms); + DBG(30, "sane_get_select_fd: ms=%p\n", (void *) ms); if ( ! ms->scanning ) { @@ -542,7 +543,7 @@ sane_open(SANE_String_Const name, SANE_Handle *handle) ms = malloc(sizeof(Microtek2_Scanner)); DBG(100, "sane_open: ms=%p, malloc'd %d bytes\n", - ms, sizeof(Microtek2_Scanner)); + (void *) ms, sizeof(Microtek2_Scanner)); if ( ms == NULL ) { DBG(1, "sane_open: malloc() for ms failed\n"); @@ -614,7 +615,7 @@ sane_read(SANE_Handle handle, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *len ) } else { - DBG(15, "sane_read: Scanner %p not scanning\n", ms); + DBG(15, "sane_read: Scanner %p not scanning\n", (void *) ms); status = SANE_STATUS_IO_ERROR; } DBG(15, "sane_read: scan cancelled or scanner not scanning->cleanup\n"); @@ -720,7 +721,7 @@ add_device_list(SANE_String_Const dev_name, Microtek2_Device **mdev) md = (Microtek2_Device *) malloc(sizeof(Microtek2_Device)); DBG(100, "add_device_list: md=%p, malloc'd %d bytes\n", - md, sizeof(Microtek2_Device)); + (void *) md, sizeof(Microtek2_Device)); if ( md == NULL ) { DBG(1, "add_device_list: malloc() for md failed\n"); @@ -890,7 +891,7 @@ cancel_scan(Microtek2_Scanner *ms) SANE_Status status; - DBG(30, "cancel_scan: ms=%p\n", ms); + DBG(30, "cancel_scan: ms=%p\n", (void *) ms); /* READ IMAGE with a transferlength of 0 aborts a scan */ ms->transfer_length = 0; @@ -1135,7 +1136,7 @@ check_inquiry(Microtek2_Device *md, SANE_String *model_string) { Microtek2_Info *mi; - DBG(30, "check_inquiry: md=%p\n", md); + DBG(30, "check_inquiry: md=%p\n", (void *) md); md->n_control_bytes = 0; md->shading_length = 0; @@ -1339,7 +1340,7 @@ cleanup_scanner(Microtek2_Scanner *ms) Microtek2_Device *md; md = ms->dev; - DBG(30, "cleanup_scanner: ms=%p, ms->sfd=%d\n", ms, ms->sfd); + DBG(30, "cleanup_scanner: ms=%p, ms->sfd=%d\n", (void *) ms, ms->sfd); if ( ms->scanning == SANE_TRUE ) status=cancel_scan(ms); @@ -1659,7 +1660,7 @@ dump_attributes(Microtek2_Info *mi) int i; - DBG(30, "dump_attributes: mi=%p\n", mi); + DBG(30, "dump_attributes: mi=%p\n", (void *) mi); DBG(1, "\n"); DBG(1, "Scanner attributes from device structure\n"); DBG(1, "========================================\n"); @@ -1898,7 +1899,7 @@ parse_config_file(FILE *fp, Config_Temp **ct) Config_Temp *hct2; - DBG(30, "parse_config_file: fp=%p\n", fp); + DBG(30, "parse_config_file: fp=%p\n", (void *) fp); *ct = hct1 = NULL; @@ -2014,7 +2015,8 @@ init_options(Microtek2_Scanner *ms, u_int8_t current_scan_source) /* descriptors must be initialized */ /* cannot be used as after a sane_close the sod's must be initialized */ - DBG(30, "init_options: handle=%p, source=%d\n", ms, current_scan_source); + DBG(30, "init_options: handle=%p, source=%d\n", (void *) ms, + current_scan_source); sod = ms->sod; val = ms->val; @@ -2231,7 +2233,7 @@ init_options(Microtek2_Scanner *ms, u_int8_t current_scan_source) md->custom_gamma_table[color] = (SANE_Int *) malloc(tablesize * sizeof(SANE_Int)); DBG(100, "init_options: md->custom_gamma_table[%d]=%p, malloc'd %d bytes\n", - color, md->custom_gamma_table[color],(tablesize * sizeof(SANE_Int))); + color, (void *) md->custom_gamma_table[color],(tablesize * sizeof(SANE_Int))); if ( md->custom_gamma_table[color] == NULL ) { DBG(1, "init_options: malloc for custom gamma table failed\n"); @@ -2357,7 +2359,7 @@ init_options(Microtek2_Scanner *ms, u_int8_t current_scan_source) sod[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT; sod[OPT_NUM_OPTS].constraint_type = SANE_CONSTRAINT_NONE; val[OPT_NUM_OPTS].w = NUM_OPTIONS; /* NUM_OPTIONS is no option */ - DBG(255, "sod=%p\n", sod); + DBG(255, "sod=%p\n", (void *) sod); DBG(255, "OPT_NUM_OPTS=%d\n", OPT_NUM_OPTS); DBG(255, "SANE_CAP_SOFT_DETECT=%d\n", SANE_CAP_SOFT_DETECT); DBG(255, "OPT_NUM_OPTS.cap=%d\n", sod[0].cap); @@ -2849,7 +2851,7 @@ set_option_dependencies(Microtek2_Scanner *ms, SANE_Option_Descriptor *sod, md = ms->dev; DBG(40, "set_option_dependencies: val=%p, sod=%p, mode=%s\n", - val, sod, val[OPT_MODE].s); + (void *) val, (void *) sod, val[OPT_MODE].s); if ( strcmp(val[OPT_MODE].s, MD_MODESTRING_COLOR) == 0 ) { @@ -3563,7 +3565,7 @@ sane_get_option_descriptor(SANE_Handle handle, SANE_Int n) Microtek2_Scanner *ms = handle; DBG(255, "sane_get_option_descriptor: handle=%p, sod=%p, opt=%d\n", - handle, ms->sod, n); + (void *) handle, (void *) ms->sod, n); if ( n < 0 || n > NUM_OPTIONS ) { @@ -3580,7 +3582,7 @@ static SANE_Status restore_gamma_options(SANE_Option_Descriptor *sod, Option_Value *val) { - DBG(40, "restore_gamma_options: val=%p, sod=%p\n", val, sod); + DBG(40, "restore_gamma_options: val=%p, sod=%p\n", (void *) val, (void *) sod); #if 0 /* if we donīt have a gamma table return immediately */ @@ -3716,7 +3718,7 @@ calculate_sane_params(Microtek2_Scanner *ms) Microtek2_Info *mi; - DBG(30, "calculate_sane_params: ms=%p\n", ms); + DBG(30, "calculate_sane_params: ms=%p\n", (void *) ms); md = ms->dev; mi = &md->info[md->scan_source]; @@ -3763,7 +3765,7 @@ get_calib_params(Microtek2_Scanner *ms) Microtek2_Info *mi; - DBG(30, "get_calib_params: handle=%p\n", ms); + DBG(30, "get_calib_params: handle=%p\n", (void *) ms); md = ms->dev; mi = &md->info[md->scan_source]; @@ -3834,7 +3836,7 @@ get_scan_parameters(Microtek2_Scanner *ms) int i; - DBG(30, "get_scan_parameters: handle=%p\n", ms); + DBG(30, "get_scan_parameters: handle=%p\n", (void *) ms); md = ms->dev; mi = &md->info[md->scan_source]; @@ -4026,7 +4028,7 @@ get_scan_mode_and_depth(Microtek2_Scanner *ms, Microtek2_Device *md; Microtek2_Info *mi; - DBG(30, "get_scan_mode_and_depth: handle=%p\n", ms); + DBG(30, "get_scan_mode_and_depth: handle=%p\n", (void *) ms); md = ms->dev; mi = &md->info[md->scan_source]; @@ -4137,7 +4139,7 @@ scsi_wait_for_image(Microtek2_Scanner *ms) SANE_Status status; - DBG(30, "scsi_wait_for_image: ms=%p\n", ms); + DBG(30, "scsi_wait_for_image: ms=%p\n", (void *) ms); while ( retry-- > 0 ) { @@ -4289,7 +4291,7 @@ scsi_inquiry(Microtek2_Info *mi, char *device) int sfd; - DBG(30, "scsi_inquiry: mi=%p, device='%s'\n", mi, device); + DBG(30, "scsi_inquiry: mi=%p, device='%s'\n", (void *) mi, device); status = sanei_scsi_open(device, &sfd, scsi_sense_handler, 0); if ( status != SANE_STATUS_GOOD ) @@ -4375,7 +4377,7 @@ scsi_read_attributes(Microtek2_Info *pmi, char *device, u_int8_t scan_source) mi = &pmi[scan_source]; DBG(30, "scsi_read_attributes: mi=%p, device='%s', source=%d\n", - mi, device, scan_source); + (void *) mi, device, scan_source); RSA_CMD(readattributes); RSA_SETMEDIA(readattributes, scan_source); @@ -4477,7 +4479,7 @@ scsi_read_control_bits(Microtek2_Scanner *ms) md = ms->dev; - DBG(30, "scsi_read_control_bits: ms=%p, fd=%d\n", ms, ms->sfd); + DBG(30, "scsi_read_control_bits: ms=%p, fd=%d\n", (void *) ms, ms->sfd); DBG(30, "ms->control_bytes = %p\n", ms->control_bytes); RCB_SET_CMD(cmd); @@ -4528,7 +4530,7 @@ scsi_set_window(Microtek2_Scanner *ms, int n) { /* n windows, not yet */ int size; - DBG(30, "scsi_set_window: ms=%p, wnd=%d\n", ms, n); + DBG(30, "scsi_set_window: ms=%p, wnd=%d\n", (void *) ms, n); size = SW_CMD_L + SW_HEADER_L + n * SW_BODY_L; setwindow = (u_int8_t *) malloc(size); @@ -4624,7 +4626,7 @@ scsi_read_image_info(Microtek2_Scanner *ms) md = ms->dev; - DBG(30, "scsi_read_image_info: ms=%p\n", ms); + DBG(30, "scsi_read_image_info: ms=%p\n", (void *) ms); RII_SET_CMD(cmd); @@ -4676,7 +4678,7 @@ scsi_read_image(Microtek2_Scanner *ms, u_int8_t *buffer) size_t size; - DBG(30, "scsi_read_image: ms=%p, buffer=%p\n", ms, buffer); + DBG(30, "scsi_read_image: ms=%p, buffer=%p\n", (void *) ms, buffer); ENDIAN_TYPE(endiantype) RI_SET_CMD(cmd); @@ -4718,7 +4720,7 @@ scsi_read_image_status(Microtek2_Scanner *ms) md = ms->dev; mi = &md->info[md->scan_source]; - DBG(30, "scsi_read_image_status: ms=%p\n", ms); + DBG(30, "scsi_read_image_status: ms=%p\n", (void *) ms); ENDIAN_TYPE(endian_type) RIS_SET_CMD(cmd); @@ -4883,7 +4885,7 @@ scsi_read_system_status(Microtek2_Device *md, int fd) size_t size; SANE_Status status; - DBG(30, "scsi_read_system_status: md=%p, fd=%d\n", md, fd); + DBG(30, "scsi_read_system_status: md=%p, fd=%d\n", (void *) md, fd); if ( fd == -1 ) { @@ -4959,7 +4961,7 @@ scsi_request_sense(Microtek2_Scanner *ms) int asl; int as_info_length; - DBG(30, "scsi_request_sense: ms=%p\n", ms); + DBG(30, "scsi_request_sense: ms=%p\n", (void *) ms); RQS_CMD(requestsense); RQS_ALLOCLENGTH(requestsense, 100); @@ -4999,7 +5001,7 @@ scsi_send_system_status(Microtek2_Device *md, int fd) SANE_Status status; - DBG(30, "scsi_send_system_status: md=%p, fd=%d\n", md, fd); + DBG(30, "scsi_send_system_status: md=%p, fd=%d\n", (void *) md, fd); memset(cmd, 0, SSS_CMD_L + SSS_DATA_L); if ( fd == -1 ) @@ -5500,7 +5502,7 @@ prepare_buffers(Microtek2_Scanner *ms) int i; status = SANE_STATUS_GOOD; - DBG(30, "prepare_buffers: ms=0x%p\n", ms); + DBG(30, "prepare_buffers: ms=0x%p\n", (void *) ms); md = ms->dev; mi = &md->info[md->scan_source]; @@ -5702,7 +5704,7 @@ write_shading_pnm(Microtek2_Scanner *ms) md = ms->dev; mi = &md->info[md->scan_source]; - DBG(30, "write_shading_pnm: ms=%p\n", ms); + DBG(30, "write_shading_pnm: ms=%p\n", (void *) ms); if ( mi->depth & MI_HASDEPTH_16 ) factor = 256; @@ -5860,7 +5862,7 @@ condense_shading(Microtek2_Scanner *ms) md = ms->dev; mi = &md->info[md->scan_source]; - DBG(30, "condense_shading: ms=%p, ppl=%d\n", ms, ms->ppl); + DBG(30, "condense_shading: ms=%p, ppl=%d\n", (void *) ms, ms->ppl); if ( md->shading_table_w == NULL ) { DBG(1, "condense shading: no shading table found, skip shading\n"); @@ -6018,7 +6020,7 @@ read_shading_image(Microtek2_Scanner *ms) int max_lines; int lines_to_read; - DBG(30, "read_shading_image: ms=%p\n", ms); + DBG(30, "read_shading_image: ms=%p\n", (void *) ms); md = ms->dev; mi = &md->info[md->scan_source]; @@ -6337,7 +6339,7 @@ prepare_shading_data(Microtek2_Scanner *ms, u_int32_t lines, u_int8_t **data) #endif DBG(30, "prepare_shading_data: ms=%p, lines=%d, *data=%p\n", - ms, lines, *data); + (void *) ms, lines, *data); md = ms->dev; mi = &md->info[md->scan_source]; @@ -6361,7 +6363,7 @@ prepare_shading_data(Microtek2_Scanner *ms, u_int32_t lines, u_int8_t **data) #ifdef MICROTEK2_CALIB_USE_MEDIAN sortbuf = malloc( lines * ms->lut_entry_size ); DBG(100, "prepare_shading_data: sortbuf= %p, malloc'd %d Bytes\n", - sortbuf, lines * ms->lut_entry_size); + (void *) sortbuf, lines * ms->lut_entry_size); if ( sortbuf == NULL ) { DBG(1, "prepare_shading_data: malloc for sort buffer failed\n"); @@ -6492,7 +6494,7 @@ prepare_shading_data(Microtek2_Scanner *ms, u_int32_t lines, u_int8_t **data) } #ifdef MICROTEK2_CALIB_USE_MEDIAN - DBG(100, "prepare_shading_data: free sortbuf at %p\n", sortbuf); + DBG(100, "prepare_shading_data: free sortbuf at %p\n", (void *) sortbuf); free(sortbuf); sortbuf = NULL; #endif @@ -6509,7 +6511,7 @@ read_cx_shading(Microtek2_Scanner *ms) Microtek2_Device *md; md = ms->dev; - DBG(30, "read_cx_shading: ms=%p\n",ms); + DBG(30, "read_cx_shading: ms=%p\n",(void *) ms); md->shading_table_contents = ms->mode; @@ -6575,7 +6577,7 @@ read_cx_shading_image(Microtek2_Scanner *ms) buf = ms->shading_image; DBG(30, "read_cx_shading_image: ms=%p, shading_bytes=%d\n", - ms, shading_bytes); + (void *) ms, shading_bytes); linesize = shading_bytes / md->shading_length; #ifdef TESTBACKEND @@ -6639,7 +6641,7 @@ calc_cx_shading_line(Microtek2_Scanner *ms) sortbuf = malloc( md->shading_length * sizeof(float) ); DBG(100, "calc_cx_shading: sortbuf= %p, malloc'd %d Bytes\n", - sortbuf, md->shading_length * sizeof(float)); + (void *) sortbuf, md->shading_length * sizeof(float)); if ( sortbuf == NULL ) { DBG(1, "calc_cx_shading: malloc for sort buffer failed\n"); @@ -6697,7 +6699,7 @@ calc_cx_shading_line(Microtek2_Scanner *ms) "shading_line_bytes=%d\n" "shading_line_pixels=%d\n" "shading_table_pointer=%p\n", - ms, md->shading_table_w, md->shading_table_d, + (void *) ms, md->shading_table_w, md->shading_table_d, shading_line_bytes, shading_line_pixels, shading_table_pointer); /* calculating the median pixel values over the shading lines */ @@ -6753,7 +6755,7 @@ get_lut_size(Microtek2_Info *mi, int *max_lut_size, int *lut_entry_size) /* returns the maximum lookup table size. A device might indicate */ /* several lookup table sizes. */ - DBG(30, "get_lut_size: mi=%p\n", mi); + DBG(30, "get_lut_size: mi=%p\n", (void *) mi); *max_lut_size = 0; *lut_entry_size = 0; @@ -6805,7 +6807,7 @@ get_lut_size(Microtek2_Info *mi, int *max_lut_size, int *lut_entry_size) *lut_entry_size = 2; } DBG(30, "get_lut_size: mi=%p, lut_size=%d, lut_entry_size=%d\n", - mi, *max_lut_size, *lut_entry_size); + (void *) mi, *max_lut_size, *lut_entry_size); return SANE_STATUS_GOOD; } @@ -6830,7 +6832,7 @@ calculate_gamma(Microtek2_Scanner *ms, u_int8_t *pos, int color, char *mode) DBG(30, "calculate_gamma: ms=%p, pos=%p, color=%d, mode=%s\n", - ms, pos, color, mode); + (void *) ms, pos, color, mode); md = ms->dev; mi = &md->info[md->scan_source]; @@ -6948,7 +6950,7 @@ shading_function(Microtek2_Scanner *ms, u_int8_t *data) int i; - DBG(40, "shading_function: ms=%p, data=%p\n", ms, data); + DBG(40, "shading_function: ms=%p, data=%p\n", (void *) ms, data); md = ms->dev; mi = &md->info[md->scan_source]; @@ -7034,7 +7036,7 @@ set_exposure(Microtek2_Scanner *ms) u_int8_t exposure_rgb[3]; - DBG(30, "set_exposure: ms=%p\n", ms); + DBG(30, "set_exposure: ms=%p\n", (void *) ms); md = ms->dev; mi = &md->info[md->scan_source]; @@ -7107,7 +7109,7 @@ reader_process(Microtek2_Scanner *ms) sigset_t sigterm_set; static u_int8_t *temp_current = NULL; - DBG(30, "reader_process: ms=%p\n", ms); + DBG(30, "reader_process: ms=%p\n", (void *) ms); md = ms->dev; mi = &md->info[md->scan_source]; @@ -7239,7 +7241,7 @@ chunky_proc_data(Microtek2_Scanner *ms) int bpl_ppl_diff; - DBG(30, "chunky_proc_data: ms=%p\n", ms); + DBG(30, "chunky_proc_data: ms=%p\n", (void *) ms); md = ms->dev; mi = &md->info[md->scan_source]; @@ -7301,7 +7303,7 @@ chunky_copy_pixels(Microtek2_Scanner *ms, u_int8_t *from) int color; DBG(30, "chunky_copy_pixels: from=%p, pixels=%d, fp=%p, depth=%d\n", - from, ms->ppl, ms->fp, ms->depth); + from, ms->ppl, (void *) ms->fp, ms->depth); md = ms->dev; if ( ms->depth > 8 ) @@ -7362,7 +7364,7 @@ segreg_proc_data(Microtek2_Scanner *ms) int frame; int right_to_left; - DBG(30, "segreg_proc_data: ms=%p\n", ms); + DBG(30, "segreg_proc_data: ms=%p\n", (void *) ms); md = ms->dev; mi = &md->info[md->scan_source]; @@ -7531,7 +7533,7 @@ segreg_copy_pixels(Microtek2_Scanner *ms) DBG(30, "segreg_copy_pixels: pixels=%d\n", ms->ppl); DBG(100, "segreg_copy_pixels: buffer 0x%p, right_to_left=%d, depth=%d\n", - ms->buf.current_pos, right_to_left, ms->depth); + (void *) ms->buf.current_pos, right_to_left, ms->depth); for (color = 0; color < 3; color++ ) f[color] = (float) ms->balance[color] / 100.0; @@ -7643,7 +7645,7 @@ lplconcat_proc_data(Microtek2_Scanner *ms) int right_to_left; /* 0=left to right, 1=right to left */ - DBG(30, "lplconcat_proc_data: ms=%p\n", ms); + DBG(30, "lplconcat_proc_data: ms=%p\n", (void *) ms); /* This data format seems to honour the color sequence indicator */ @@ -7714,7 +7716,7 @@ lplconcat_copy_pixels(Microtek2_Scanner *ms, DBG(30, "lplconcat_copy_pixels: ms=%p, righttoleft=%d, gamma=%d,\n", - ms, right_to_left, gamma_by_backend); + (void *) ms, right_to_left, gamma_by_backend); md = ms->dev; mi = &md->info[md->scan_source]; @@ -7829,7 +7831,7 @@ wordchunky_proc_data(Microtek2_Scanner *ms) u_int32_t line; - DBG(30, "wordchunky_proc_data: ms=%p\n", ms); + DBG(30, "wordchunky_proc_data: ms=%p\n", (void *) ms); from = ms->buf.src_buf; for ( line = 0; line < (u_int32_t) ms->src_lines_to_read; line++ ) @@ -7965,7 +7967,7 @@ gray_copy_pixels(Microtek2_Scanner *ms, float s_w, s_d, shading_factor = 0; DBG(30, "gray_copy_pixels: pixels=%d, from=%p, fp=%p, depth=%d\n", - ms->ppl, from, ms->fp, ms->depth); + ms->ppl, from, (void *) ms->fp, ms->depth); md = ms->dev; step = right_to_left == 1 ? -1 : 1; @@ -8069,7 +8071,7 @@ proc_onebit_data(Microtek2_Scanner *ms) int toindex; - DBG(30, "proc_onebit_data: ms=%p\n", ms); + DBG(30, "proc_onebit_data: ms=%p\n", (void *) ms); md = ms->dev; mi = &md->info[md->scan_source]; @@ -8200,7 +8202,7 @@ lineartfake_copy_pixels(Microtek2_Scanner *ms, DBG(30, "lineartfake_copy_pixels: from=%p,pixels=%d,threshold=%d,file=%p\n", - from, pixels, threshold, fp); + from, pixels, threshold, (void *) fp); md = ms->dev; bit = 0; dest = 0; @@ -8274,7 +8276,7 @@ auto_adjust_proc_data(Microtek2_Scanner *ms, u_int8_t **temp_current) DBG(30, "auto_adjust_proc_data: ms=%p, temp_current=%p\n", - ms, *temp_current); + (void *) ms, *temp_current); md = ms->dev; mi = &md->info[md->scan_source]; diff --git a/backend/mustek_scsi_pp.c b/backend/mustek_scsi_pp.c index cd04bdb40..cc5d3e555 100644 --- a/backend/mustek_scsi_pp.c +++ b/backend/mustek_scsi_pp.c @@ -467,7 +467,7 @@ mustek_scsi_pp_check_response (int fd) } static SANE_Status -mustek_scsi_pp_send_command (int fd, u_char * cmd) +mustek_scsi_pp_send_command (int fd, const u_char * cmd) { int i; signed char checksum; @@ -525,7 +525,7 @@ mustek_scsi_pp_send_command (int fd, u_char * cmd) } static SANE_Status -mustek_scsi_pp_send_data_block (int fd, u_char * data, int len) +mustek_scsi_pp_send_data_block (int fd, const u_char * data, int len) { int i; signed char checksum; @@ -812,7 +812,7 @@ mustek_scsi_pp_cmd (int fd, const void *src, size_t src_size, src_size - 6); stat = - mustek_scsi_pp_send_data_block (fd, ((u_char *) src) + 6, + mustek_scsi_pp_send_data_block (fd, ((const u_char *) src) + 6, src_size - 6); if (stat != SANE_STATUS_GOOD) { diff --git a/backend/mustek_usb_high.c b/backend/mustek_usb_high.c index 2ee8c5d7b..f6a01255d 100644 --- a/backend/mustek_usb_high.c +++ b/backend/mustek_usb_high.c @@ -87,7 +87,7 @@ usb_high_cal_init (Calibrator * cal, SANE_Byte type, SANE_Word target_white, SANE_Word target_dark) { DBG (5, "usb_high_cal_init: start, cal=%p, type=%d, target_white=%d " - "target_dark=%d\n", cal, type, target_white, target_dark); + "target_dark=%d\n", (void *) cal, type, target_white, target_dark); cal->is_prepared = SANE_FALSE; cal->k_white = NULL; cal->k_dark = NULL; @@ -869,7 +869,7 @@ usb_high_scan_exit (Mustek_Usb_Device * dev) SANE_Status usb_high_scan_prepare (Mustek_Usb_Device * dev) { - DBG (5, "usb_high_scan_prepare: start dev=%p\n", dev); + DBG (5, "usb_high_scan_prepare: start dev=%p\n", (void *) dev); if (dev->is_prepared) { DBG (5, "usb_high_scan_prepare: is already prepared\n"); @@ -895,7 +895,7 @@ usb_high_scan_prepare (Mustek_Usb_Device * dev) SANE_Status usb_high_scan_clearup (Mustek_Usb_Device * dev) { - DBG (5, "usb_high_scan_clearup: start, dev=%p\n", dev); + DBG (5, "usb_high_scan_clearup: start, dev=%p\n", (void *) dev); if (!dev->is_prepared) { DBG (3, "usb_high_scan_clearup: is not prepared\n"); @@ -977,7 +977,7 @@ SANE_Status usb_high_scan_set_threshold (Mustek_Usb_Device * dev, SANE_Byte threshold) { DBG (5, "usb_high_scan_set_threshold: start, dev=%p, threshold=%d\n", - dev, threshold); + (void *) dev, threshold); dev->threshold = threshold; DBG (5, "usb_high_scan_set_threshold: exit\n"); @@ -988,7 +988,7 @@ SANE_Status usb_high_scan_embed_gamma (Mustek_Usb_Device * dev, SANE_Word * gamma_table) { DBG (5, "usb_high_scan_embed_gamma: start, dev=%p, gamma_table=%p\n", - dev, gamma_table); + (void *) dev, (void *) gamma_table); if (!dev->is_prepared) { DBG (5, "usb_high_scan_embed_gamma !is_prepared\n"); @@ -2082,7 +2082,7 @@ usb_high_scan_adjust_mono_300_power_delay (Mustek_Usb_Device * dev) SANE_Status usb_high_scan_evaluate_pixel_rate (Mustek_Usb_Device * dev) { - DBG (5, "usb_high_scan_evaluate_pixel_rate: start, dev=%p\n", dev); + DBG (5, "usb_high_scan_evaluate_pixel_rate: start, dev=%p\n", (void *) dev); /* fixme: new for CCD */ dev->pixel_rate = 2000; @@ -2101,7 +2101,7 @@ usb_high_scan_calibration_rgb_24 (Mustek_Usb_Device * dev) SANE_Word lines_left; SANE_Word minor_average; - DBG (5, "usb_high_scan_calibration_rgb_24: start, dev=%p\n", dev); + DBG (5, "usb_high_scan_calibration_rgb_24: start, dev=%p\n", (void *) dev); if (dev->is_cis_detected) { RIE (usb_mid_motor_prepare_calibrate_rgb (dev->chip, dev->y_dpi)); @@ -2364,7 +2364,7 @@ usb_high_scan_calculate_max_rgb_600_expose (Mustek_Usb_Device * dev, SANE_Word max_light_up; SANE_Word ideal_expose_time; - DBG (5, "usb_high_scan_calculate_max_rgb_600_expose: dev=%p\n", dev); + DBG (5, "usb_high_scan_calculate_max_rgb_600_expose: dev=%p\n", (void *) dev); red_light_up = dev->expose_time - dev->red_rgb_600_power_delay * 64; green_light_up = dev->expose_time - dev->green_rgb_600_power_delay * 64; @@ -2400,7 +2400,7 @@ usb_high_scan_calculate_max_mono_600_expose (Mustek_Usb_Device * dev, SANE_Word ideal_expose_time; SANE_Word transfer_time; - DBG (5, "usb_high_scan_calculate_max_mono_600_expose: dev=%p\n", dev); + DBG (5, "usb_high_scan_calculate_max_mono_600_expose: dev=%p\n", (void *) dev); max_light_up = dev->expose_time - dev->green_mono_600_power_delay * 64; transfer_time = (SANE_Word) ((SANE_Word) (dev->pixel_rate) @@ -2674,7 +2674,7 @@ usb_high_scan_get_rgb_24_bit_line (Mustek_Usb_Device * dev, SANE_Byte * line, SANE_Word lines_left; DBG (5, "usb_high_scan_get_rgb_24_bit_line: start, dev=%p, line=%p, " - "is_order_invert=%d\n", dev, line, is_order_invert); + "is_order_invert=%d\n", (void *) dev, line, is_order_invert); RIE (usb_low_get_row (dev->chip, dev->green, &lines_left)); @@ -2703,7 +2703,7 @@ usb_high_scan_get_mono_8_bit_line (Mustek_Usb_Device * dev, SANE_Byte * line, SANE_Word lines_left; DBG (5, "usb_high_scan_get_mono_8_bit_line: start, dev=%p, line=%p, " - "is_order_invert=%d\n", dev, line, is_order_invert); + "is_order_invert=%d\n", (void *) dev, line, is_order_invert); RIE (usb_low_get_row (dev->chip, dev->green, &lines_left)); RIE (usb_high_cal_calibrate (dev->mono_calibrator, dev->green + @@ -2715,7 +2715,7 @@ usb_high_scan_get_mono_8_bit_line (Mustek_Usb_Device * dev, SANE_Byte * line, SANE_Status usb_high_scan_backtrack_rgb_24 (Mustek_Usb_Device * dev) { - DBG (5, "usb_high_scan_backtrack_rgb_24: noop, dev=%p\n", dev); + DBG (5, "usb_high_scan_backtrack_rgb_24: noop, dev=%p\n", (void *) dev); return SANE_STATUS_GOOD; } @@ -2726,7 +2726,7 @@ usb_high_scan_backtrack_mono_8 (Mustek_Usb_Device * dev) SANE_Status status; SANE_Word lines_left; - DBG (5, "usb_high_scan_backtrack_mono_8: start, dev=%p\n", dev); + DBG (5, "usb_high_scan_backtrack_mono_8: start, dev=%p\n", (void *) dev); if (dev->y_dpi >= 300) { diff --git a/backend/mustek_usb_low.c b/backend/mustek_usb_low.c index 4b7ff7478..13a654783 100644 --- a/backend/mustek_usb_low.c +++ b/backend/mustek_usb_low.c @@ -160,7 +160,7 @@ usb_low_init (ma1017 ** chip_address) SANE_Status usb_low_exit (ma1017 * chip) { - DBG (7, "usb_low_exit: chip = %p\n", chip); + DBG (7, "usb_low_exit: chip = %p\n", (void *) chip); if (chip) { if (chip->fd >= 0) @@ -2808,7 +2808,7 @@ usb_low_open (ma1017 * chip, SANE_String_Const devname) SANE_Status status; Mustek_Type scanner_type; - DBG (7, "usb_low_open: start: chip = %p\n", chip); + DBG (7, "usb_low_open: start: chip = %p\n", (void *) chip); if (chip->is_rowing) { @@ -2870,7 +2870,7 @@ usb_low_open (ma1017 * chip, SANE_String_Const devname) SANE_Status usb_low_close (ma1017 * chip) { - DBG (7, "usb_low_close: start, chip=%p\n", chip); + DBG (7, "usb_low_close: start, chip=%p\n", (void *) chip); if (!chip->is_opened) { DBG (3, "usb_low_close: already close or never opened\n"); diff --git a/backend/mustek_usb_mid.c b/backend/mustek_usb_mid.c index def1eba01..9ca51d96a 100644 --- a/backend/mustek_usb_mid.c +++ b/backend/mustek_usb_mid.c @@ -983,13 +983,13 @@ usb_mid_sensor_is600_mode (ma1017 * chip, SANE_Word dpi) if (chip->sensor == ST_CANON300) { DBG (6, "usb_mid_sensor_is600_mode: chip=%p, dpi=%d, FALSE\n", - chip, dpi); + (void *) chip, dpi); return SANE_FALSE; } else if ((chip->sensor == ST_CANON600) || (chip->sensor == ST_NEC600)) { DBG (6, "usb_mid_sensor_is600_mode: chip=%p, dpi=%d, TRUE\n", - chip, dpi); + (void *) chip, dpi); return SANE_TRUE; } else @@ -1001,13 +1001,13 @@ usb_mid_sensor_is600_mode (ma1017 * chip, SANE_Word dpi) case 100: case 50: DBG (6, "usb_mid_sensor_is600_mode: chip=%p, dpi=%d, FALSE\n", - chip, dpi); + (void *) chip, dpi); return SANE_FALSE; case 600: case 400: case 200: DBG (6, "usb_mid_sensor_is600_mode: chip=%p, dpi=%d, TRUE\n", - chip, dpi); + (void *) chip, dpi); return SANE_TRUE; default: DBG (3, "usb_mid_sensor_is600_mode: unmatched dpi: %d\n", dpi); diff --git a/backend/nec.c b/backend/nec.c index cbe57dc79..116830c3e 100644 --- a/backend/nec.c +++ b/backend/nec.c @@ -292,6 +292,8 @@ sense_handler(int fd, u_char *sense_buffer, void *ss) int sense_key; NEC_Sense_Data *sdat = (NEC_Sense_Data *) ss; + fd = fd; /* silence compilation warnings */ + #define add_sense_code sense_buffer[12] #define add_sense_qual sense_buffer[13] @@ -554,6 +556,7 @@ get_window (int fd, void *buf, size_t * buf_size) return (status); } +#if 0 static SANE_Status get_data_buffer_status (int fd, void *buf, size_t *buf_size) { @@ -568,6 +571,7 @@ get_data_buffer_status (int fd, void *buf, size_t *buf_size) DBG (11, ">>\n"); return (status); } +#endif #ifdef USE_FORK @@ -979,7 +983,7 @@ attach (const char *devnam, NEC_Device ** devp) int fd; unsigned char inquiry_data[INQUIRY_LEN]; - const char *model_name; + const unsigned char *model_name; mode_sense_param msp; size_t buf_size; DBG (10, "<< attach "); @@ -1102,7 +1106,7 @@ attach (const char *devnam, NEC_Device ** devp) return (SANE_STATUS_NO_MEM); memset (dev, 0, sizeof (*dev)); - dev->sane.name = strdup (devnam); + dev->sane.name = (SANE_String) strdup (devnam); dev->sane.vendor = "NEC"; model_name = inquiry_data + 16; dev->sane.model = strndup (model_name, 10); @@ -1885,6 +1889,8 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize) NEC_New_Device *np; int i; + authorize = authorize; /* silence compilation warnings */ + DBG_INIT (); DBG (10, "<< sane_init "); @@ -2072,6 +2078,8 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only) int i; DBG (10, "<< sane_get_devices "); + local_only = local_only; /* silence compilation warnings */ + if (devlist) free (devlist); devlist = malloc ((num_devices + 1) * sizeof (devlist[0])); @@ -2200,7 +2208,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option, #else SANE_Word cap; #endif - int i, range_index; + int range_index; DBG (10, "<< sane_control_option %i", option); if (info) @@ -2650,9 +2658,9 @@ sprint_gamma(Option_Value val, SANE_Byte *dst) int i; SANE_Byte *p = dst; - p += sprintf(p, "%i", val.wa[0]); + p += sprintf((char *) p, "%i", val.wa[0]); for (i = 1; i < 256; i++) - p += sprintf(p, ",%i", val.wa[i] > 255 ? 255 : val.wa[i]); + p += sprintf((char *) p, ",%i", val.wa[i] > 255 ? 255 : val.wa[i]); return p - dst; } @@ -2702,7 +2710,9 @@ static SANE_Status send_binary_g_table(NEC_Scanner *s, SANE_Word *a, int dtq) { SANE_Status status; - int i, j; + unsigned int i, j; + + dtq = dtq; /* silence compilation warnings */ DBG(11, "<< send_binary_g_table\n"); @@ -2782,6 +2792,8 @@ send_gamma_tables (NEC_Scanner *s) #endif #ifdef USE_COLOR_THRESHOLD +/* not used? */ +#if 0 static SANE_Status send_threshold_data(NEC_Scanner *s) { @@ -2794,7 +2806,7 @@ send_threshold_data(NEC_Scanner *s) restricted to the range 0..255), 3 '/' and the null-byte, total: 16 bytes. */ - len = sprintf(&cmd[10], "%i/%i/%i/%i", + len = sprintf((char *) &cmd[10], "%i/%i/%i/%i", s->val[OPT_THRESHOLD_R].w, s->val[OPT_THRESHOLD_G].w, s->val[OPT_THRESHOLD_B].w, @@ -2806,6 +2818,7 @@ send_threshold_data(NEC_Scanner *s) return status; } #endif +#endif SANE_Status sane_start (SANE_Handle handle) @@ -3682,6 +3695,9 @@ sane_cancel (SANE_Handle handle) SANE_Status sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking) { + handle = handle; + non_blocking = non_blocking; /* silence compilation warnings */ + DBG (10, "<< sane_set_io_mode"); DBG (10, ">>\n"); @@ -3691,6 +3707,9 @@ sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking) SANE_Status sane_get_select_fd (SANE_Handle handle, SANE_Int * fd) { + handle = handle; + fd = fd; /* silence compilation warnings */ + DBG (10, "<< sane_get_select_fd"); DBG (10, ">>\n"); diff --git a/backend/net.c b/backend/net.c index 88bd33699..7100908a3 100644 --- a/backend/net.c +++ b/backend/net.c @@ -468,7 +468,7 @@ static SANE_Status fetch_options (Net_Scanner * s) { int option_number; - DBG (3, "fetch_options: %p\n", s); + DBG (3, "fetch_options: %p\n", (void *) s); if (s->opt.num_options) { @@ -544,7 +544,7 @@ fetch_options (Net_Scanner * s) static SANE_Status do_cancel (Net_Scanner * s) { - DBG (2, "do_cancel: %p\n", s); + DBG (2, "do_cancel: %p\n", (void *) s); s->hw->auth_active = 0; if (s->data >= 0) { @@ -563,7 +563,7 @@ do_authorization (Net_Device * dev, SANE_String resource) SANE_Char password[SANE_MAX_PASSWORD_LEN]; char *net_resource; - DBG (2, "do_authorization: dev=%p resource=%s\n", dev, resource); + DBG (2, "do_authorization: dev=%p resource=%s\n", (void *) dev, resource); dev->auth_active = 1; @@ -632,8 +632,8 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize) DBG_INIT (); - DBG (2, "sane_init: authorize = %p, version_code = %p\n", authorize, - version_code); + DBG (2, "sane_init: authorize = %p, version_code = %p\n", (void *) authorize, + (void *) version_code); devlist = 0; first_device = 0; @@ -773,7 +773,7 @@ sane_exit (void) { next_device = dev->next; - DBG (2, "sane_exit: closing dev %p, ctl=%d\n", dev, dev->ctl); + DBG (2, "sane_exit: closing dev %p, ctl=%d\n", (void *) dev, dev->ctl); if (dev->ctl >= 0) { @@ -1718,7 +1718,7 @@ sane_read (SANE_Handle handle, SANE_Byte * data, SANE_Int max_length, int is_even; DBG (3, "sane_read: handle=%p, data=%p, max_length=%d, length=%p\n", - handle, data, max_length, length); + handle, data, max_length, (void *) length); if (!length) { DBG (1, "sane_read: length == NULL\n"); diff --git a/backend/qcam.c b/backend/qcam.c index e2795264f..21fe795fc 100644 --- a/backend/qcam.c +++ b/backend/qcam.c @@ -399,7 +399,7 @@ qc_waithand2 (QC_Device *q, int val) do { status = read_lpdata (q); - } while ((status & CamRdy2) != val); + } while ((status & CamRdy2) != (unsigned int) val); return status; } @@ -899,7 +899,8 @@ reader_process (QC_Scanner *s, int in_fd, int out_fd) else { /* strange -- should be 15:63 below, but 4bpp is odd */ - int i, shift, invert; + int shift, invert; + unsigned int i; u_char val; switch (s->val[OPT_DEPTH].w) @@ -1404,6 +1405,8 @@ sane_init (SANE_Int *version_code, SANE_Auth_Callback authorize) size_t len; FILE *fp; + authorize = authorize; /* silence compilation warnings */ + DBG_INIT(); if (version_code) @@ -1455,6 +1458,8 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only) QC_Device *dev; int i; + local_only = local_only; /* silence compilation warnings */ + if (devlist) free (devlist); diff --git a/backend/ricoh-scsi.c b/backend/ricoh-scsi.c index b1c683bc3..72fd70bea 100644 --- a/backend/ricoh-scsi.c +++ b/backend/ricoh-scsi.c @@ -318,7 +318,7 @@ get_data_status (int fd, struct scsi_status_desc *dbs) memcpy (dbs, &ssd.desc, sizeof(*dbs)); if (status == SANE_STATUS_GOOD && - (_3btol(ssd.len) <= sizeof(*dbs) || _3btol(ssd.desc.filled) == 0)) { + (((unsigned int) _3btol(ssd.len)) <= sizeof(*dbs) || _3btol(ssd.desc.filled) == 0)) { DBG (11, "get_data_status: busy\n"); status = SANE_STATUS_DEVICE_BUSY; } diff --git a/backend/s9036.c b/backend/s9036.c index 6ef9801bd..23f74ba3a 100644 --- a/backend/s9036.c +++ b/backend/s9036.c @@ -124,6 +124,9 @@ test_ready (int fd) static SANE_Status sense_handler (int scsi_fd, u_char *result, void *arg) { + scsi_fd = scsi_fd; + arg = arg; /* silence compilation warnings */ + if (result[0]) { DBG (0, "sense_handler() : sense code = %02x\n", result[0]); @@ -138,6 +141,8 @@ sense_handler (int scsi_fd, u_char *result, void *arg) static SANE_Status stop_scan (int fd) { + fd = fd; /* silence compilation warnings */ + /* XXX don't know how to stop the scanner. To be tested ! */ #if 0 const Byte scsi_rewind[] = @@ -447,7 +452,7 @@ read_more_data (S9036_Scanner * s) size_t size; int lines_read; int bpl = s->params.bytes_per_line; - int i; + unsigned int i; if (s->lines_in_scanner == 0) { @@ -495,7 +500,7 @@ read_more_data (S9036_Scanner * s) return SANE_STATUS_IO_ERROR; } - if (size != lines_read * s->params.bytes_per_line) + if (size != (unsigned int) lines_read * s->params.bytes_per_line) { DBG (1, "sanei_scsi_cmd(): got %lu bytes, expected %d\n", (u_long) size, lines_read * s->params.bytes_per_line); @@ -823,6 +828,8 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize) size_t len; FILE *fp; + authorize = authorize; /* silence compilation warnings */ + DBG_INIT (); if (version_code) @@ -871,6 +878,8 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only) static const SANE_Device **devlist = 0; S9036_Device *dev; int i; + + local_only = local_only; /* silence compilation warnings */ if (devlist) free (devlist); @@ -1229,7 +1238,7 @@ static void copy_buffer (S9036_Scanner * s, SANE_Byte ** buf, SANE_Int * max_len, SANE_Int * len) { - if (*max_len > s->in_buffer) + if (*max_len > (SANE_Int) s->in_buffer) { memcpy (*buf, s->bufstart, s->in_buffer); *buf += s->in_buffer; @@ -1266,7 +1275,7 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len, DBG (3, "sane_read(%d) : lines_read %d\n", max_len, s->lines_read); - while (max_len > s->in_buffer && s->lines_read < s->params.lines) + while (max_len > (SANE_Int) s->in_buffer && s->lines_read < s->params.lines) { if (s->in_buffer == 0) @@ -1314,6 +1323,8 @@ sane_cancel (SANE_Handle handle) SANE_Status sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking) { + handle = handle; /* silence compilation warnings */ + DBG (1, "sane_set_io_mode(%d)\n", non_blocking); return (non_blocking == SANE_TRUE) ? @@ -1323,5 +1334,8 @@ sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking) SANE_Status sane_get_select_fd (SANE_Handle handle, SANE_Int * fd) { + handle = handle; + fd = fd; /* silence compilation warnings */ + return SANE_STATUS_UNSUPPORTED; } diff --git a/backend/sp15c-scsi.h b/backend/sp15c-scsi.h index 92f9f2264..04e768bd3 100644 --- a/backend/sp15c-scsi.h +++ b/backend/sp15c-scsi.h @@ -49,6 +49,9 @@ static const char RCSid_sh[] = "$Header$"; /* ------------------------------------------------------------------------- */ /* * $Log$ + * Revision 1.4 2003/12/27 17:48:38 hmg-guest + * Silenced some compilation warnings. + * * Revision 1.3 2000/08/12 15:09:37 pere * Merge devel (v1.0.3) into head branch. * @@ -148,8 +151,8 @@ putnbyte (unsigned char *pnt, unsigned int value, unsigned int nbytes) \ typedef struct { - char *cmd; - int size; + unsigned char *cmd; + unsigned int size; } scsiblk; diff --git a/backend/sp15c.c b/backend/sp15c.c index efd169def..807da1362 100644 --- a/backend/sp15c.c +++ b/backend/sp15c.c @@ -45,6 +45,9 @@ static const char RCSid[] = "$Header$"; /* * $Log$ + * Revision 1.5 2003/12/27 17:48:38 hmg-guest + * Silenced some compilation warnings. + * * Revision 1.4 2001/05/31 18:01:39 hmg * Fixed config_line[len-1] bug which could generate an access * violation if len==0. @@ -233,6 +236,8 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize) char dev_name[PATH_MAX]; size_t len; FILE *fp; + authorize = authorize; /* silence compilation warnings */ + DBG_INIT (); DBG (10, "sane_init\n"); @@ -266,6 +271,8 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only) static const SANE_Device **devlist = 0; struct sp15c *dev; int i; + + local_only = local_only; /* silence compilation warnings */ DBG (10, "sane_get_devices\n"); @@ -290,6 +297,9 @@ sane_open (SANE_String_Const name, SANE_Handle * handle) { struct sp15c *dev = first_dev; + name = name; /* silence compilation warnings */ + /* Strange, name is not used? */ + DBG (10, "sane_open\n"); if (!dev) @@ -340,6 +350,9 @@ sane_open (SANE_String_Const name, SANE_Handle * handle) SANE_Status sane_set_io_mode (SANE_Handle h, SANE_Bool non_blocking) { + h = h; + non_blocking = non_blocking; /* silence compilation warnings */ + DBG (10, "sane_set_io_mode\n"); return SANE_STATUS_UNSUPPORTED; } /* sane_set_io_mode */ @@ -348,6 +361,9 @@ sane_set_io_mode (SANE_Handle h, SANE_Bool non_blocking) SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fdp) { + h = h; + fdp = fdp; /* silence compilation warnings */ + DBG (10, "sane_get_select_fd\n"); return SANE_STATUS_UNSUPPORTED; } /* sane_get_select_fd */ @@ -1038,6 +1054,9 @@ attach_one (const char *name) static SANE_Status sense_handler (int scsi_fd, u_char * result, void *arg) { + scsi_fd = scsi_fd; + arg = arg; /* silence compilation warnings */ + return request_sense_parse (result); } /* sense_handler */ @@ -1273,6 +1292,7 @@ static SANE_Status sp15c_do_inquiry (struct sp15c *s) { static SANE_Status ret; + DBG (10, "do_inquiry\n"); memset (s->buffer, '\0', 256); /* clear buffer */ @@ -1283,7 +1303,7 @@ sp15c_do_inquiry (struct sp15c *s) } /* sp15c_do_inquiry */ static SANE_Status -do_scsi_cmd (int fd, char *cmd, int cmd_len, char *out, size_t out_len) +do_scsi_cmd (int fd, unsigned char *cmd, int cmd_len, unsigned char *out, size_t out_len) { SANE_Status ret; size_t ol = out_len; @@ -1733,7 +1753,10 @@ do_cancel (struct sp15c *scanner) static void swap_res (struct sp15c *s) -{ /* for the time being, do nothing */ +{ + s = s; /* silence compilation warnings */ + + /* for the time being, do nothing */ } /* swap_res */ static int @@ -1763,6 +1786,8 @@ sp15c_set_window_param (struct sp15c *s, int prescan) int ret; int active_buffer_size; + prescan = prescan; /* silence compilation warnings */ + wait_scanner (s); DBG (10, "set_window_param\n"); memset (buffer_r, '\0', WDB_size_max); /* clear buffer */ @@ -1896,6 +1921,8 @@ sp15c_start_scan (struct sp15c *s) static void sigterm_handler (int signal) { + signal = signal; /* silence compilation warnings */ + sanei_scsi_req_flush_all (); /* flush SCSI queue */ _exit (SANE_STATUS_GOOD); } /* sigterm_handler */ @@ -1910,7 +1937,7 @@ reader_process (struct sp15c *scanner, int pipe_fd) FILE *fp; sigset_t sigterm_set; struct SIGACTION act; - int i; + unsigned int i; unsigned char *src, *dst; DBG (10, "reader_process started\n"); @@ -2051,7 +2078,7 @@ bytes_per_line (struct sp15c *s) static void sp15c_trim_rowbufsize (struct sp15c *s) { - int row_len; + unsigned int row_len; row_len = bytes_per_line (s); if (s->row_bufsize >= row_len) { diff --git a/backend/sp15c.h b/backend/sp15c.h index 68ec34e35..1575e9985 100644 --- a/backend/sp15c.h +++ b/backend/sp15c.h @@ -49,6 +49,9 @@ static const char RCSid_h[] = "$Header$"; /* ------------------------------------------------------------------------- */ /* * $Log$ + * Revision 1.4 2003/12/27 17:48:38 hmg-guest + * Silenced some compilation warnings. + * * Revision 1.3 2000/08/12 15:09:42 pere * Merge devel (v1.0.3) into head branch. * @@ -242,7 +245,7 @@ static SANE_Status sp15c_do_inquiry (struct sp15c *s); static SANE_Status - do_scsi_cmd (int fd, char *cmd, int cmd_len, char *out, size_t out_len); + do_scsi_cmd (int fd, unsigned char *cmd, int cmd_len, unsigned char *out, size_t out_len); static void hexdump (int level, char *comment, unsigned char *p, int l); diff --git a/backend/st400.c b/backend/st400.c index 615cd2e9b..2e6d9d09c 100644 --- a/backend/st400.c +++ b/backend/st400.c @@ -100,7 +100,7 @@ static ST400_Model st400_models[] = { { 0, "", 0, "", 6, 0x200000UL, 65536UL, NULL, "Unknown", "untested", "flatbed scanner" }, /* matches anything */ /* must be last */ - { 0, NULL } + { 0, NULL, 0, NULL, 0, 0, 0, NULL, NULL, NULL, NULL } }; #define MM_PER_INCH 25.4 @@ -173,7 +173,7 @@ static void st400_reset_options( ST400_Device *dev ); } while(0) -static int str_at_offset(char *str, size_t offset, char *data) +static int str_at_offset(char *str, size_t offset, unsigned char *data) { size_t len; @@ -381,7 +381,7 @@ st400_fill_scanner_buffer( ST400_Device *dev ) { SANE_Status status; - DBG(DCODE, "st400_fill_scanner_buffer(%p)\n", dev); + DBG(DCODE, "st400_fill_scanner_buffer(%p)\n", (void *) dev); if( dev->lines_to_read == 0 ) dev->status.eof = 1; @@ -414,7 +414,7 @@ st400_fill_backend_buffer( ST400_Device *dev ) size_t r; SANE_Status status; - DBG(DCODE, "st400_fill_backend_buffer(%p)\n", dev); + DBG(DCODE, "st400_fill_backend_buffer(%p)\n", (void *) dev); if( dev->bytes_in_scanner == 0 ) { status = st400_fill_scanner_buffer(dev); @@ -442,6 +442,9 @@ st400_sense_handler( int fd, SANE_Byte *result, void *arg ) /* ST400_Device *dev = arg; */ SANE_Status status; + fd = fd; + arg = arg; /* silence compilation warnings */ + switch( result[0] & 0x0f ) { case 0x0: status = SANE_STATUS_GOOD; @@ -491,7 +494,7 @@ st400_attach( const char *devname, ST400_Device **devP ) SANE_Status status; int fd; - DBG(DCODE, "st400_attach(%s, %p)\n", devname, devP); + DBG(DCODE, "st400_attach(%s, %p)\n", devname, (void *) devP); if( devP ) *devP = NULL; @@ -507,7 +510,7 @@ st400_attach( const char *devname, ST400_Device **devP ) dev = calloc(1, sizeof(*dev)); if( !dev ) return SANE_STATUS_NO_MEM; - DBG(DCODE, "st400_attach: new device struct at %p\n", dev); + DBG(DCODE, "st400_attach: new device struct at %p\n", (void *) dev); status = sanei_scsi_open(devname, &fd, st400_sense_handler, dev); if( status == SANE_STATUS_GOOD ) { @@ -563,6 +566,8 @@ st400_config_get_arg(char **optP, unsigned long *argP, size_t linenum) { int n; + linenum = linenum; /* silence compilation warnings */ + if( sscanf(*optP, "%lu%n", argP, &n) == 1 ) { *optP += n; *optP = (char *)sanei_config_skip_whitespace(*optP); @@ -675,7 +680,7 @@ sane_init( SANE_Int *versionP, SANE_Auth_Callback authorize ) SANE_Status status; DBG_INIT(); - DBG(DCODE, "sane_init(%p, %p)\n", versionP, authorize); + DBG(DCODE, "sane_init(%p, %p)\n", (void *) versionP, (void *) authorize); if( versionP != NULL ) *versionP = SANE_VERSION_CODE(V_MAJOR, V_MINOR, 0); @@ -748,7 +753,7 @@ sane_get_devices( const SANE_Device ***devarrayP, SANE_Bool local_only ) ST400_Device *dev; unsigned int i; - DBG(DCODE, "sane_get_devices(%p, %d)\n", devarrayP, (int)local_only); + DBG(DCODE, "sane_get_devices(%p, %d)\n", (void *) devarrayP, (int)local_only); if( !st400_status.array_valid ) { if( st400_device_array ) { @@ -758,7 +763,7 @@ sane_get_devices( const SANE_Device ***devarrayP, SANE_Bool local_only ) st400_device_array = malloc((st400_num_devices + 1) * sizeof(*st400_device_array)); if( !st400_device_array ) return SANE_STATUS_NO_MEM; - DBG(DCODE, "sane_get_devices: new device array at %p\n", st400_device_array); + DBG(DCODE, "sane_get_devices: new device array at %p\n", (void *) st400_device_array); dev = st400_devices; for( i = 0; i < st400_num_devices; i++ ) { @@ -781,7 +786,7 @@ sane_open( SANE_String_Const devicename, SANE_Handle *handleP ) ST400_Device *dev; SANE_Status status; - DBG(DCODE, "sane_open(%s, %p)\n", devicename, handleP); + DBG(DCODE, "sane_open(%s, %p)\n", devicename, (void *) handleP); *handleP = NULL; if( devicename && devicename[0] ) { @@ -826,7 +831,7 @@ sane_close( SANE_Handle handle ) static void st400_reset_options( ST400_Device *dev ) { - DBG(DCODE, "st400_reset_options(%p)\n", dev); + DBG(DCODE, "st400_reset_options(%p)\n", (void *) dev); dev->val[OPT_NUM_OPTS] = NUM_OPTIONS; dev->val[OPT_RESOLUTION] = dev->opt[OPT_RESOLUTION].constraint.word_list[1]; @@ -857,7 +862,7 @@ st400_init_options( ST400_Device *dev ) SANE_FIX(0.0), SANE_FIX(ST400_MAX_Y * MM_PER_INCH), SANE_FIX(0.0) }; - DBG(DCODE, "st400_init_options(%p)\n", dev); + DBG(DCODE, "st400_init_options(%p)\n", (void *)dev); dev->opt[OPT_NUM_OPTS].name = SANE_NAME_NUM_OPTIONS; dev->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS; @@ -967,7 +972,7 @@ sane_control_option( SANE_Handle handle, SANE_Int optnum, ST400_Device *dev = handle; SANE_Status status; - DBG(DCODE, "sane_control_option(%p, %d, %d, %p, %p)\n", handle, (int)optnum, (int)action, valP, infoP); + DBG(DCODE, "sane_control_option(%p, %d, %d, %p, %p)\n", (void *) handle, (int)optnum, (int)action, valP, (void *) infoP); if( infoP ) *infoP = 0; @@ -1052,7 +1057,7 @@ sane_get_parameters( SANE_Handle handle, SANE_Parameters *paramsP ) { ST400_Device *dev = handle; - DBG(DCODE, "sane_get_parameters(%p, %p)\n", handle, paramsP); + DBG(DCODE, "sane_get_parameters(%p, %p)\n", handle, (void *) paramsP); if( !dev->status.open ) return SANE_STATUS_INVAL; @@ -1125,10 +1130,10 @@ sane_start( SANE_Handle handle ) if( !dev->buffer ) { if( st400_maxread > 0 ) - dev->bufsize = min(st400_maxread, sanei_scsi_max_request_size); + dev->bufsize = min(st400_maxread, (unsigned int) sanei_scsi_max_request_size); else if( dev->model->maxread > 0 ) - dev->bufsize = min(dev->model->maxread, sanei_scsi_max_request_size); + dev->bufsize = min(dev->model->maxread, (unsigned int) sanei_scsi_max_request_size); else dev->bufsize = sanei_scsi_max_request_size; DBG(DVAR, "allocating %lu bytes buffer\n", (u_long)dev->bufsize); @@ -1219,7 +1224,7 @@ sane_read( SANE_Handle handle, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenP ) size_t r, i; SANE_Byte val; - DBG(DCODE, "sane_read(%p, %p, %d, %p)\n", handle, buf, (int)maxlen, lenP); + DBG(DCODE, "sane_read(%p, %p, %d, %p)\n", handle, buf, (int)maxlen, (void *) lenP); *lenP = 0; if( !dev->status.scanning ) @@ -1239,7 +1244,7 @@ sane_read( SANE_Handle handle, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenP ) } } - r = min(dev->bytes_in_buffer, maxlen); + r = min((SANE_Int) dev->bytes_in_buffer, maxlen); if( dev->val[OPT_DEPTH] == 1 || dev->model->bits == 8 ) { /* This is simple. We made sure the scanning are is aligned to @@ -1298,7 +1303,7 @@ sane_set_io_mode( SANE_Handle handle, SANE_Bool nonblock ) SANE_Status sane_get_select_fd( SANE_Handle handle, SANE_Int *fdP ) { - DBG(DCODE, "sane_get_select_fd(%p, %p)\n", handle, fdP); + DBG(DCODE, "sane_get_select_fd(%p, %p)\n", handle, (void *) fdP); return SANE_STATUS_UNSUPPORTED; } diff --git a/backend/tamarack.c b/backend/tamarack.c index 80ad0461c..e949196ef 100644 --- a/backend/tamarack.c +++ b/backend/tamarack.c @@ -177,6 +177,9 @@ wait_ready (int fd) static SANE_Status sense_handler (int scsi_fd, u_char *result, void *arg) { + scsi_fd = scsi_fd; + arg = arg; /* silence compilation warnings */ + switch (result[0]) { case 0x00: @@ -883,6 +886,8 @@ sane_init (SANE_Int *version_code, SANE_Auth_Callback authorize) size_t len; FILE *fp; + authorize = authorize; /* silence compilation warnings */ + DBG_INIT(); if (version_code) @@ -930,6 +935,8 @@ sane_get_devices (const SANE_Device ***device_list, SANE_Bool local_only) Tamarack_Device *dev; int i; + local_only = local_only; /* silence compilation warnings */ + if (devlist) free (devlist); diff --git a/backend/tamarack.h b/backend/tamarack.h index bf0dd2e4e..e2c2ccdb7 100644 --- a/backend/tamarack.h +++ b/backend/tamarack.h @@ -241,8 +241,8 @@ struct page_header{ struct tamarack_page { char gamma; - char thresh; - char masks; + unsigned char thresh; + unsigned char masks; char delay; char features; char pad0; diff --git a/sanei/sanei_scsi.c b/sanei/sanei_scsi.c index bdeb61bcf..b4f6f498b 100644 --- a/sanei/sanei_scsi.c +++ b/sanei/sanei_scsi.c @@ -1809,7 +1809,7 @@ issue (struct req *req) return; fdp = (fdparms *) fd_info[req->fd].pdata; - DBG (4, "sanei_scsi.issue: %p\n", req); + DBG (4, "sanei_scsi.issue: %p\n", (void *) req); rp = fdp->sane_qhead; while (rp && rp->running) @@ -2118,7 +2118,7 @@ issue (struct req *req) else fdp->sane_qhead = fdp->sane_qtail = req); - DBG (4, "scsi_req_enter: entered %p\n", req); + DBG (4, "scsi_req_enter: entered %p\n", (void *) req); *idp = req; issue (req); @@ -2139,7 +2139,7 @@ issue (struct req *req) /* we don't support out-of-order completion */ assert (req == ((fdparms *) fd_info[req->fd].pdata)->sane_qhead); - DBG (4, "sanei_scsi_req_wait: waiting for %p\n", req); + DBG (4, "sanei_scsi_req_wait: waiting for %p\n", (void *) req); issue (req); /* ensure the command is running */ if (req->done) diff --git a/tools/check-usb-chip.c b/tools/check-usb-chip.c index 3bb1e9716..76ceeb9d0 100644 --- a/tools/check-usb-chip.c +++ b/tools/check-usb-chip.c @@ -1342,7 +1342,6 @@ check_gl660_gl646 (struct usb_device *dev) static char * check_icm532b (struct usb_device *dev) { - unsigned char val; int result; usb_dev_handle *handle;