X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Ftape.c;h=d615960b1dc05b3cedfde591d9ed50002e041dca;hb=c9e4e868a4f92342e883219136acc2b6a405102f;hp=54f11786ecc9be06c13d86a30e4d8119e4e7f947;hpb=956756f2bece84f31bc9647c0939ce2d283d6312;p=dump.git

diff --git a/dump/tape.c b/dump/tape.c
index 54f1178..d615960 100644
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.82 2004/03/08 14:04:04 stelian Exp $";
+	"$Id: tape.c,v 1.85 2004/07/01 09:14:49 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -116,8 +116,8 @@ int 	eot_code = 1;
 long long tapea_bytes = 0;	/* bytes_written at start of current volume */
 static int magtapeout;		/* output is really a tape */
 
-static	ssize_t dump_atomic_read __P((int, void *, size_t));
-static	ssize_t dump_atomic_write __P((int, const void *, size_t));
+static	ssize_t dump_atomic_read __P((int, char *, size_t));
+static	ssize_t dump_atomic_write __P((int, const char *, size_t));
 #ifdef WRITEDEBUG
 static	void doslave __P((int, int, int));
 #else
@@ -142,7 +142,7 @@ static int MkTapeString __P((struct s_spcl *, long long));
  * The following structure defines the instruction packets sent to slaves.
  */
 struct req {
-	daddr_t dblk;
+	ext2_loff_t dblk;
 	int count;
 };
 int reqsiz;
@@ -234,7 +234,7 @@ void
 writerec(const void *dp, int isspcl)
 {
 
-	slp->req[trecno].dblk = (daddr_t)0;
+	slp->req[trecno].dblk = (ext2_loff_t)0;
 	slp->req[trecno].count = 1;
 	/* XXX post increment triggers an egcs-1.1.2-12 bug on alpha/sparc */
 	*(union u_spcl *)(*(nextblock)) = *(union u_spcl *)dp;
@@ -272,9 +272,10 @@ writerec(const void *dp, int isspcl)
 }
 
 void
-dumpblock(daddr_t blkno, int size)
+dumpblock(blk_t blkno, int size)
 {
-	int avail, tpblks, dblkno;
+	int avail, tpblks;
+	ext2_loff_t dblkno;
 
 	dblkno = fsbtodb(sblock, blkno);
 	tpblks = size >> tp_bshift;
@@ -1087,9 +1088,6 @@ doslave(int cmd,
 	int compresult;
 	volatile int do_compress = !first;
 	unsigned long worklen;
-#ifdef HAVE_BZLIB
-	unsigned int worklen2;
-#endif
 #ifdef HAVE_LZO
 	lzo_align_t __LZO_MMODEL *LZO_WorkMem;
 #endif
@@ -1226,7 +1224,7 @@ doslave(int cmd,
 #endif /* HAVE_ZLIB */
 #ifdef HAVE_BZLIB
 			if (zipflag == COMPRESS_BZLIB) {
-				worklen2 = worklen;
+				unsigned int worklen2 = worklen;
 				compresult = BZ2_bzBuffToBuffCompress(
 						       comp_buf->buf,
 						       &worklen2,
@@ -1244,10 +1242,12 @@ doslave(int cmd,
 #endif /* HAVE_BZLIB */
 #ifdef HAVE_LZO
 			if (zipflag == COMPRESS_LZO) {
+				lzo_uint worklen2 = worklen;
 				compresult = lzo1x_1_compress((char *)slp->tblock[0],writesize,
                                                               comp_buf->buf,
-							      (lzo_uintp)&worklen,
+							      &worklen2,
                                                               LZO_WorkMem);
+				worklen = worklen2;
 				if (compresult == LZO_E_OK)
 					compresult = 1;
 				else
@@ -1382,13 +1382,13 @@ doslave(int cmd,
  * loop until the count is satisfied (or error).
  */
 static ssize_t
-dump_atomic_read(int fd, void *buf, size_t count)
+dump_atomic_read(int fd, char *buf, size_t count)
 {
 	int got, need = count;
 
 	do {
 		while ((got = read(fd, buf, need)) > 0 && (need -= got) > 0)
-			(char *)buf += got;
+			buf += got;
 	} while (got == -1 && errno == EINTR);
 	return (got < 0 ? got : (ssize_t)count - need);
 }
@@ -1399,13 +1399,13 @@ dump_atomic_read(int fd, void *buf, size_t count)
  * loop until the count is satisfied (or error).
  */
 static ssize_t
-dump_atomic_write(int fd, const void *buf, size_t count)
+dump_atomic_write(int fd, const char *buf, size_t count)
 {
 	int got, need = count;
 
 	do {
 		while ((got = write(fd, buf, need)) > 0 && (need -= got) > 0)
-			(char *)buf += got;
+			buf += got;
 	} while (got == -1 && errno == EINTR);
 	return (got < 0 ? got : (ssize_t)count - need);
 }