X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=compat%2Finclude%2Fprotocols%2Fdumprestore.h;h=77b185950fae27bc8e8956c975684f25eb60972f;hb=0d0bc3269d21d8a5d3d019a19d8250b852a4d3ff;hp=ef74c3950a43415c04167c4d92428c8a13d442f9;hpb=1227625a12a66e0ded78a1997c2d23f23202a382;p=dump.git

diff --git a/compat/include/protocols/dumprestore.h b/compat/include/protocols/dumprestore.h
index ef74c39..77b1859 100644
--- a/compat/include/protocols/dumprestore.h
+++ b/compat/include/protocols/dumprestore.h
@@ -1,7 +1,8 @@
 /*
  *	Ported to Linux's Second Extended File System as part of the
  *	dump and restore backup suit
- *	Remy Card <card@Linux.EU.Org>, 1994, 1995, 1996
+ *	Remy Card <card@Linux.EU.Org>, 1994-1997
+ *      Stelian Pop <pop@cybercable.fr>, 1999
  *
  */
 
@@ -42,11 +43,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)dumprestore.h	8.2 (Berkeley) 1/21/94
+ * $Id: dumprestore.h,v 1.5 2000/01/08 10:00:41 tiniou Exp $
  */
 
-#ifndef _DUMPRESTORE_H_
-#define _DUMPRESTORE_H_
+#ifndef _PROTOCOLS_DUMPRESTORE_H_
+#define _PROTOCOLS_DUMPRESTORE_H_
 
 /*
  * TP_BSIZE is the size of file blocks on the dump tapes.
@@ -74,29 +75,29 @@
 union u_spcl {
 	char dummy[TP_BSIZE];
 	struct	s_spcl {
-		__s32	c_type;		    /* record type (see below) */
-		__u32	c_date;		    /* date of this dump */
-		__u32	c_ddate;	    /* date of previous dump */
-		__s32	c_volume;	    /* dump volume number */
+		int32_t	c_type;		    /* record type (see below) */
+		int32_t	c_date;		    /* date of this dump */
+		int32_t	c_ddate;	    /* date of previous dump */
+		int32_t	c_volume;	    /* dump volume number */
 		daddr_t	c_tapea;	    /* logical block of this record */
 		ino_t	c_inumber;	    /* number of inode */
-		__s32	c_magic;	    /* magic number (see above) */
-		__s32	c_checksum;	    /* record checksum */
+		int32_t	c_magic;	    /* magic number (see above) */
+		int32_t	c_checksum;	    /* record checksum */
 #ifdef	__linux__
 		struct	new_bsd_inode c_dinode;
 #else
 		struct	dinode	c_dinode;   /* ownership and mode of inode */
 #endif
-		__s32	c_count;	    /* number of valid c_addr entries */
+		int32_t	c_count;	    /* number of valid c_addr entries */
 		char	c_addr[TP_NINDIR];  /* 1 => data; 0 => hole in inode */
 		char	c_label[LBLSIZE];   /* dump label */
-		__s32	c_level;	    /* level of this dump */
+		int32_t	c_level;	    /* level of this dump */
 		char	c_filesys[NAMELEN]; /* name of dumpped file system */
 		char	c_dev[NAMELEN];	    /* name of dumpped device */
 		char	c_host[NAMELEN];    /* name of dumpped host */
-		__s32	c_flags;	    /* additional information */
-		__s32	c_firstrec;	    /* first record on volume */
-		__s32	c_spare[32];	    /* reserved for future uses */
+		int32_t	c_flags;	    /* additional information */
+		int32_t	c_firstrec;	    /* first record on volume */
+		int32_t	c_spare[32];	    /* reserved for future uses */
 	} s_spcl;
 } u_spcl;
 #define spcl u_spcl.s_spcl
@@ -116,8 +117,4 @@ union u_spcl {
 #define DR_NEWHEADER	0x0001	/* new format tape header */
 #define DR_NEWINODEFMT	0x0002	/* new format inodes on tape */
 
-#define	DUMPOUTFMT	"%-16s %c %s"		/* for printf */
-						/* name, level, ctime(date) */
-#define	DUMPINFMT	"%16s %c %[^\n]\n"	/* inverse for scanf */
-
 #endif /* !_DUMPRESTORE_H_ */