[Debburn-changes] r590 - in cdrkit/trunk: icedax libusal

[Eduard Bloch]

Author: blade
Date: 2006-12-08 14:00:08 +0100 (Fri, 08 Dec 2006)
New Revision: 590

Modified:
   cdrkit/trunk/icedax/icedax.c
   cdrkit/trunk/libusal/scsitransp.c
Log:
Some type casts on pointers

Modified: cdrkit/trunk/icedax/icedax.c
===================================================================
--- cdrkit/trunk/icedax/icedax.c	2006-12-08 11:57:34 UTC (rev 589)
+++ cdrkit/trunk/icedax/icedax.c	2006-12-08 13:00:08 UTC (rev 590)
@@ -1041,7 +1041,7 @@
 
 int on_exitscsi(void *status)
 {
-	exit((int)status);
+	exit((intptr_t)status);
 	return 0;
 }
 
@@ -1059,9 +1059,9 @@
 		SCSI *usalp = get_scsi_p();
 		if (usalp->running) {
 			usalp->cb_fun = on_exitscsi;
-			usalp->cb_arg = (void *)status;
+			usalp->cb_arg = (void *) (uintptr_t) status;
 		} else {
-			on_exitscsi((void *)status);
+			on_exitscsi((void *) (intptr_t) status);
 		} 
 	} else {
 		exit(status);

Modified: cdrkit/trunk/libusal/scsitransp.c
===================================================================
--- cdrkit/trunk/libusal/scsitransp.c	2006-12-08 11:57:34 UTC (rev 589)
+++ cdrkit/trunk/libusal/scsitransp.c	2006-12-08 13:00:08 UTC (rev 590)
@@ -1154,7 +1154,7 @@
 		return (0);
 
 	if (cp->sense.code >= 0x70)
-	return &(cp->sense);
+	return (char *) &(cp->sense);
 }