2004-04-06 Jochen Eisinger <jochen@penguin-breeder.org>

* sanei/sanei_pa4s2.c include/sane/sanei_pa4s2.h, backend/mustek_pp.c:
	  fixed compiler warnings

ChangeLog

@@ -1,3 +1,8 @@
+2004-04-06  Jochen Eisinger <jochen@penguin-breeder.org>
+
+	* sanei/sanei_pa4s2.c include/sane/sanei_pa4s2.h, backend/mustek_pp.c:
+	  fixed compiler warnings
+
 2004-04-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
 	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c

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");

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 
  *

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();