X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Fdump.h;h=f26d12b6260b9f72f80e9f4b55c4037a503b92c3;hp=8960c88e7a8f0b29801898fbf451cbe3ee3d119d;hb=a3ab8e4243d14360f2769230d23e7d3afd6397cb;hpb=28ba5caee0ed25d3b38da769967173e5710bc10c

diff --git a/dump/dump.h b/dump/dump.h
index 8960c88..f26d12b 100644
--- a/dump/dump.h
+++ b/dump/dump.h
@@ -5,7 +5,7 @@
  *	Stelian Pop <stelian@popies.net>, 1999-2000
  *	Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  *
- *	$Id: dump.h,v 1.48 2004/04/21 08:55:51 stelian Exp $
+ *	$Id: dump.h,v 1.50 2010/04/28 09:29:50 stelian Exp $
  */
 
 /*-
@@ -42,7 +42,7 @@
 #include <compatlfs.h>
 
 #define MAXINOPB	(MAXBSIZE / sizeof(struct dinode))
-#define MAXNINDIR	(MAXBSIZE / sizeof(daddr_t))
+#define MAXNINDIR	(MAXBSIZE / sizeof(blk_t))
 #define NUM_STR_SIZE	32	/* a generic number buffer size */
 
 /*
@@ -91,7 +91,7 @@ extern int	fifoout;	/* true => output to fifo */
 extern dump_ino_t curino;	/* current inumber; used globally */
 extern int	newtape;	/* new tape flag */
 extern int	density;	/* density in 0.1" units */
-extern long	tapesize;	/* estimated tape size, blocks */
+extern long long tapesize;	/* estimated tape size, blocks */
 extern long	tsize;		/* tape size in 0.1" units */
 extern long	asize;		/* number of 0.1" units written on current tape */
 extern int	etapes;		/* estimated number of tapes */
@@ -148,16 +148,16 @@ time_t	unctime __P((const char *str));
 /* mapping rouintes */
 struct	dinode;
 long	blockest __P((struct dinode const *dp));
-int	mapfiles __P((dump_ino_t maxino, long *tapesize));
+int	mapfiles __P((dump_ino_t maxino, long long *tapesize));
 #ifdef	__linux__
-int	mapfilesfromdir __P((dump_ino_t maxino, long *tapesize, char *directory));
-int	maponefile __P((dump_ino_t maxino, long *tapesize, char *directory));
+int	mapfilesfromdir __P((dump_ino_t maxino, long long *tapesize, char *directory));
+int	maponefile __P((dump_ino_t maxino, long long *tapesize, char *directory));
 #endif
-int	mapdirs __P((dump_ino_t maxino, long *tapesize));
+int	mapdirs __P((dump_ino_t maxino, long long *tapesize));
 
 /* file dumping routines */
-void	blksout __P((daddr_t *blkp, int frags, dump_ino_t ino));
-void	bread __P((daddr_t blkno, char *buf, int size));
+void	blksout __P((blk_t *blkp, int frags, dump_ino_t ino));
+void	bread __P((ext2_loff_t blkno, char *buf, int size));
 void	dumpino __P((struct dinode *dp, dump_ino_t ino, int metaonly));
 #ifdef	__linux__
 void	dumpdirino __P((struct dinode *dp, dump_ino_t ino));
@@ -169,7 +169,7 @@ void	mkchecksum __P((union u_spcl *tmpspcl));
 /* tape writing routines */
 int	alloctape __P((void));
 void	close_rewind __P((void));
-void	dumpblock __P((daddr_t blkno, int size));
+void	dumpblock __P((blk_t blkno, int size));
 void	startnewtape __P((int top));
 time_t	trewind __P((void));
 void	writerec __P((const void *dp, int isspcl));