From 40638d29d72db7372edc78af52cc356bc7684d52 Mon Sep 17 00:00:00 2001 From: Jochen Eisinger Date: Tue, 6 Apr 2004 18:02:57 +0000 Subject: [PATCH] 2004-04-06 Jochen Eisinger * sanei/sanei_pa4s2.c include/sane/sanei_pa4s2.h, backend/mustek_pp.c: fixed compiler warnings --- ChangeLog | 5 +++++ backend/mustek_pp.c | 4 ++-- include/sane/sanei_pa4s2.h | 2 +- sanei/sanei_pa4s2.c | 10 +++++----- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c0a08841..85d2e66a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-04-06 Jochen Eisinger + + * sanei/sanei_pa4s2.c include/sane/sanei_pa4s2.h, backend/mustek_pp.c: + fixed compiler warnings + 2004-04-04 Henning Meier-Geinitz * backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c diff --git a/backend/mustek_pp.c b/backend/mustek_pp.c index 7a5e1c613..553dbb488 100644 --- a/backend/mustek_pp.c +++ b/backend/mustek_pp.c @@ -638,7 +638,7 @@ attach_device(SANE_String *driver, SANE_String *name, SANE_String *port, SANE_String *option_ta) { int found = 0, driver_no, port_no; - char **ports; + const char **ports; if (!strcmp (*port, "*")) { @@ -737,7 +737,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize) if (fp == NULL) { char driver_name[64]; - char **devices = sanei_pa4s2_devices(); + const char **devices = sanei_pa4s2_devices(); int device_no; DBG (2, "sane_init: could not open configuration file\n"); diff --git a/include/sane/sanei_pa4s2.h b/include/sane/sanei_pa4s2.h index 6cd45b5a0..105e73952 100644 --- a/include/sane/sanei_pa4s2.h +++ b/include/sane/sanei_pa4s2.h @@ -69,7 +69,7 @@ * @sa sanei_pa4s2_open * */ -extern char ** sanei_pa4s2_devices(void); +extern const char ** sanei_pa4s2_devices(void); /** Open pa4s2 device * diff --git a/sanei/sanei_pa4s2.c b/sanei/sanei_pa4s2.c index 06f23ac8f..b98245b43 100644 --- a/sanei/sanei_pa4s2.c +++ b/sanei/sanei_pa4s2.c @@ -556,9 +556,9 @@ pa4s2_open (const char *dev, SANE_Status * status) #define inbyte2(fd) (ieee1284_read_control(pplist.portv[fd]) ^ C1284_INVERTED) static u_char inbyte4(int fd) { - u_char val; + char val; ieee1284_epp_read_data(pplist.portv[fd], 0, &val, 1); - return val; + return (u_char)val; } #define outbyte0(fd,val) ieee1284_write_data(pplist.portv[fd], val) @@ -567,7 +567,7 @@ static u_char inbyte4(int fd) static void outbyte3(int fd, u_char val) { - ieee1284_epp_write_addr (pplist.portv[fd], 0, &val, 1); + ieee1284_epp_write_addr (pplist.portv[fd], 0, (char *)&val, 1); } #else @@ -912,13 +912,13 @@ pa4s2_close (int fd, SANE_Status * status) } -char ** +const char ** sanei_pa4s2_devices() { SANE_Status status; int n; - char **devices; + const char **devices; TEST_DBG_INIT();