From: guenther <guenther@openbsd.org>
Date: Sat, 13 Dec 2014 21:02:32 +0000 (+0000)
Subject: Sort members by size to reduce structure padding
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=36f8a6f5ead158848aa3e08b59bd82bffa64e442;p=openbsd

Sort members by size to reduce structure padding
---

diff --git a/bin/pax/tables.h b/bin/pax/tables.h
index bc19f066948..81347852f7e 100644
--- a/bin/pax/tables.h
+++ b/bin/pax/tables.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tables.h,v 1.8 2006/08/05 23:05:13 ray Exp $	*/
+/*	$OpenBSD: tables.h,v 1.9 2014/12/13 21:02:32 guenther Exp $	*/
 /*	$NetBSD: tables.h,v 1.3 1995/03/21 09:07:47 cgd Exp $	*/
 
 /*-
@@ -58,9 +58,9 @@
  * hard links in a file system or with some archive formats (cpio)
  */
 typedef struct hrdlnk {
+	ino_t		ino;	/* files inode number */
 	char		*name;	/* name of first file seen with this ino/dev */
 	dev_t		dev;	/* files device number */
-	ino_t		ino;	/* files inode number */
 	u_long		nlink;	/* expected link count */
 	struct hrdlnk	*fow;
 } HRDLNK;
@@ -77,10 +77,10 @@ typedef struct hrdlnk {
  * handle is greatly increased).
  */
 typedef struct ftm {
-	int		namelen;	/* file name length */
-	time_t		mtime;		/* files last modification time */
 	off_t		seek;		/* location in scratch file */
+	time_t		mtime;		/* files last modification time */
 	struct ftm	*fow;
+	int		namelen;	/* file name length */
 } FTM;
 
 /*
@@ -143,12 +143,12 @@ typedef struct dlist {
  */
 
 typedef struct atdir {
-	char *name;	/* name of directory to reset */
-	dev_t dev;	/* dev and inode for fast lookup */
 	ino_t ino;
 	time_t mtime;	/* access and mod time to reset to */
 	time_t atime;
+	char *name;	/* name of directory to reset */
 	struct atdir *fow;
+	dev_t dev;	/* dev and inode for fast lookup */
 } ATDIR;
 
 /*
@@ -162,9 +162,9 @@ typedef struct atdir {
  */
 
 typedef struct dirdata {
-	char *name;	/* file name */
 	time_t mtime;	/* mtime to set */
 	time_t atime;	/* atime to set */
+	char *name;	/* file name */
 	u_int16_t mode;	/* file mode to restore */
 	u_int16_t frc_mode;	/* do we force mode settings? */
 } DIRDATA;