--- mtx-1.2.18rel/loaderinfo.c.gcc4 2001-06-05 19:10:21.000000000 +0200
+++ mtx-1.2.18rel/loaderinfo.c 2005-03-07 10:47:12.439798624 +0100
@@ -190,7 +190,7 @@ static unsigned char
input_buffer=(unsigned char *)xzmalloc(256); /* overdo it, eh? */
/* clear the sense buffer: */
- slow_bzero((char *)RequestSense,sizeof(RequestSense_T));
+ slow_bzero((unsigned char *)RequestSense,sizeof(RequestSense_T));
/* returns an array of bytes in the page, or, if not possible, NULL. */
--- mtx-1.2.18rel/scsi_linux.c.gcc4 2002-01-17 19:29:27.000000000 +0100
+++ mtx-1.2.18rel/scsi_linux.c 2005-03-07 10:47:12.440798472 +0100
@@ -187,7 +187,7 @@ int SCSI_ExecuteCommand(DEVICE_TYPE Devi
dest=Command; /* now to copy the CDB... from start of buffer,*/
dest+= sizeof(struct sg_header); /* increment it past the header. */
- slow_memcopy((char *)CDB,dest,CDB_Length);
+ slow_memcopy((unsigned char *)CDB,dest,CDB_Length);
/* if we are writing additional data, tack it on here! */
if (Direction == Output) {
@@ -222,7 +222,7 @@ int SCSI_ExecuteCommand(DEVICE_TYPE Devi
/* we don't have any real sense data, sigh :-(. */
if (Header->sense_buffer[0]) {
/* well, I guess we DID have some! eep! copy the sense data! */
- slow_memcopy((char *)Header->sense_buffer,(char *)RequestSense,
+ slow_memcopy((unsigned char *)Header->sense_buffer,(unsigned char *)RequestSense,
sizeof(Header->sense_buffer));
} else {
dest=(unsigned char *)RequestSense;
@@ -290,7 +290,7 @@ int SCSI_ExecuteCommand(DEVICE_TYPE Devi
ResultHeader->sense_buffer[0]);
#endif
/* eep! copy the sense data! */
- slow_memcopy((char *)ResultHeader->sense_buffer,(char *)RequestSense,
+ slow_memcopy((unsigned char *)ResultHeader->sense_buffer,(unsigned char *)RequestSense,
sizeof(ResultHeader->sense_buffer));
/* sense data copied, now find us a non-zero value to return :-(. */
/* NOTE: Some commands return sense data even though they validly
--- mtx-1.2.18rel/mtxl.h.gcc4 2002-01-17 19:29:27.000000000 +0100
+++ mtx-1.2.18rel/mtxl.h 2005-03-07 10:47:12.441798320 +0100
@@ -30,7 +30,7 @@
void FatalError(char *ErrorMessage, ...);
void *xmalloc(size_t Size);
void *xzmalloc(size_t Size);
-void slow_bzero(char *buffer, int numchars);
+void slow_bzero(unsigned char *buffer, int numchars);
DEVICE_TYPE SCSI_OpenDevice(char *DeviceName);
void SCSI_CloseDevice(char *DeviceName, DEVICE_TYPE DeviceFD);
--- mtx-1.2.18rel/mtxl.c.gcc4 2003-06-30 21:10:32.000000000 +0200
+++ mtx-1.2.18rel/mtxl.c 2005-03-07 10:47:12.442798168 +0100
@@ -184,7 +184,7 @@ void FatalError(char *ErrorMessage, ...)
}
/* This is a really slow and stupid 'bzero' implementation'... */
-void slow_bzero(char *buffer, int numchars) {
+void slow_bzero(unsigned char *buffer, int numchars) {
while (numchars--) *buffer++ = 0;
}
@@ -282,8 +282,8 @@ ElementModeSense_T *ReadAssignmentPage(D
CDB[5]=0;
/* clear the data buffer: */
- slow_bzero((char *)&RequestSense,sizeof(RequestSense_T));
- slow_bzero((char *)input_buffer,sizeof(input_buffer));
+ slow_bzero((unsigned char *)&RequestSense,sizeof(RequestSense_T));
+ slow_bzero((unsigned char *)input_buffer,sizeof(input_buffer));
if (SCSI_ExecuteCommand(MediumChangerFD,Input,&CDB,6,
&input_buffer,sizeof(input_buffer),&RequestSense) != 0) {
@@ -478,7 +478,7 @@ unsigned char *SendElementStatusRequest(
DataBuffer=(unsigned char *) xmalloc(NumBytes+1);
- slow_bzero((char *)RequestSense,sizeof(RequestSense_T));
+ slow_bzero((unsigned char *)RequestSense,sizeof(RequestSense_T));
#ifdef HAVE_GET_ID_LUN
scsi_id = SCSI_GetIDLun(MediumChangerFD);
#endif
@@ -544,7 +544,7 @@ unsigned char *SendElementStatusRequest(
if ( RequestSense->SenseKey > 1 ) {
/* we issued a code requesting bar codes, there is no bar code reader? */
/* clear out our sense buffer first... */
- slow_bzero((char *)RequestSense,sizeof(RequestSense_T));
+ slow_bzero((unsigned char *)RequestSense,sizeof(RequestSense_T));
CDB[1] &= ~0x10; /* clear bar code flag! */
--- mtx-1.2.18rel/tapeinfo.c.gcc4 2005-03-07 10:47:12.436799080 +0100
+++ mtx-1.2.18rel/tapeinfo.c 2005-03-07 10:47:12.442798168 +0100
@@ -330,7 +330,7 @@ static unsigned char
input_buffer=(unsigned char *)xzmalloc(256); /* overdo it, eh? */
/* clear the sense buffer: */
- slow_bzero((char *)RequestSense,sizeof(RequestSense_T));
+ slow_bzero((unsigned char *)RequestSense,sizeof(RequestSense_T));
/* returns an array of bytes in the page, or, if not possible, NULL. */
@@ -446,7 +446,7 @@ static void ReportSerialNumber(DEVICE_TY
unsigned char buffer[WILD_SER_SIZE]; /* just wildly overestimate serial# length! */
int i,lim;
- char *bufptr;
+ unsigned char *bufptr;
CDB[0]=0x12; /* INQUIRY */
CDB[1]= 1; /* EVPD = 1 */
--- mtx-1.2.18rel/scsitape.c.gcc4 2005-03-07 10:47:12.436799080 +0100
+++ mtx-1.2.18rel/scsitape.c 2005-03-07 10:47:55.472256696 +0100
@@ -54,7 +54,7 @@ void Usage(void) {
static int arg[4]; /* the argument for the command, sigh. */
/* the device handle we're operating upon, sigh. */
-static unsigned char *device; /* the text of the device thingy. */
+static char *device; /* the text of the device thingy. */
static DEVICE_TYPE MediumChangerFD = (DEVICE_TYPE) 0;
@@ -516,7 +516,7 @@ static int S_setblk(void) {
* our caller has already put us into fixed block mode. If he has not, then
* we are in trouble anyhow.
*/
-int SCSI_readt(DEVICE_TYPE fd, char * buf, unsigned int bufsize, unsigned int *len, unsigned int timeout) {
+int SCSI_readt(DEVICE_TYPE fd, unsigned char * buf, unsigned int bufsize, int *len, unsigned int timeout) {
int rtnval;
CDB_T cmd;
@@ -593,8 +593,8 @@ int SCSI_readt(DEVICE_TYPE fd, char * bu
* taken out and with the various types changed to mtx types rather than
* BRU types.
*/
-int SCSI_writet(DEVICE_TYPE fd, char * buf, unsigned int blocksize,
- unsigned int *len,
+int SCSI_writet(DEVICE_TYPE fd, unsigned char * buf, unsigned int blocksize,
+ int *len,
unsigned int timeout) {
CDB_T cmd;
