commit aa0d122348bd8ec500bee33654caf5f34f6644d6
author plougher <plougher> Fri Dec 31 20:06:24 2010 +0000
committer Mohamad Ayyash <mkayyash@google.com> Mon Feb 23 12:35:00 2015 -0800
tree 31ac9f38a027e9368764a890a5ebb382b84c2d29
parent e56b9862d07a7c6202090d74b86d28639ede52ca

get rid of squashfs_lipc_inode_header typedef

squashfs-tools/global.h

diff --git a/squashfs-tools/global.h b/squashfs-tools/global.h
index 28243c7..decf365 100644
--- a/squashfs-tools/global.h
+++ b/squashfs-tools/global.h
@@ -26,7 +26,6 @@
 
 typedef struct squashfs_super_block squashfs_super_block;
 typedef struct squashfs_base_inode_header squashfs_base_inode_header;
-typedef struct squashfs_lipc_inode_header squashfs_lipc_inode_header;
 typedef struct squashfs_dev_inode_header squashfs_dev_inode_header;
 typedef struct squashfs_ldev_inode_header squashfs_ldev_inode_header;
 typedef struct squashfs_symlink_inode_header squashfs_symlink_inode_header;

squashfs-tools/mksquashfs.c

diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
index c66ae9a..11d8226 100644
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -1465,7 +1465,7 @@
 			SQUASHFS_FIFO_TYPE ? "fifo" : "socket", nlink);
 	}
 	else if(type == SQUASHFS_LFIFO_TYPE || type == SQUASHFS_LSOCKET_TYPE) {
-		squashfs_lipc_inode_header *ipc = &inode_header.lipc;
+		struct squashfs_lipc_inode_header *ipc = &inode_header.lipc;
 
 		inode = get_inode(sizeof(*ipc));
 		ipc->nlink = nlink;

squashfs-tools/read_fs.c

diff --git a/squashfs-tools/read_fs.c b/squashfs-tools/read_fs.c
index c2ca527..d452fcf 100644
--- a/squashfs-tools/read_fs.c
+++ b/squashfs-tools/read_fs.c
@@ -345,7 +345,7 @@
 				break;
 			case SQUASHFS_LFIFO_TYPE:
 				(*fifo_count) ++;
-				cur_ptr += sizeof(squashfs_lipc_inode_header);
+				cur_ptr += sizeof(struct squashfs_lipc_inode_header);
 				break;
 			case SQUASHFS_SOCKET_TYPE:
 				(*sock_count) ++;
@@ -353,7 +353,7 @@
 				break;
 			case SQUASHFS_LSOCKET_TYPE:
 				(*sock_count) ++;
-				cur_ptr += sizeof(squashfs_lipc_inode_header);
+				cur_ptr += sizeof(struct squashfs_lipc_inode_header);
 				break;
 		 	default:
 				ERROR("Unknown inode type %d in "

squashfs-tools/squashfs_swap.h

diff --git a/squashfs-tools/squashfs_swap.h b/squashfs-tools/squashfs_swap.h
index 1d4bcaa..666858c 100644
--- a/squashfs-tools/squashfs_swap.h
+++ b/squashfs-tools/squashfs_swap.h
@@ -90,14 +90,14 @@
 }
 
 #define _SQUASHFS_SWAP_LIPC_INODE_HEADER(s, d, SWAP_FUNC) {\
-	SWAP_FUNC(16, s, d, inode_type, squashfs_lipc_inode_header);\
-	SWAP_FUNC(16, s, d, mode, squashfs_lipc_inode_header);\
-	SWAP_FUNC(16, s, d, uid, squashfs_lipc_inode_header);\
-	SWAP_FUNC(16, s, d, guid, squashfs_lipc_inode_header);\
-	SWAP_FUNC(32, s, d, mtime, squashfs_lipc_inode_header);\
-	SWAP_FUNC(32, s, d, inode_number, squashfs_lipc_inode_header);\
-	SWAP_FUNC(32, s, d, nlink, squashfs_lipc_inode_header);\
-	SWAP_FUNC(32, s, d, xattr, squashfs_lipc_inode_header);\
+	SWAP_FUNC(16, s, d, inode_type, struct squashfs_lipc_inode_header);\
+	SWAP_FUNC(16, s, d, mode, struct squashfs_lipc_inode_header);\
+	SWAP_FUNC(16, s, d, uid, struct squashfs_lipc_inode_header);\
+	SWAP_FUNC(16, s, d, guid, struct squashfs_lipc_inode_header);\
+	SWAP_FUNC(32, s, d, mtime, struct squashfs_lipc_inode_header);\
+	SWAP_FUNC(32, s, d, inode_number, struct squashfs_lipc_inode_header);\
+	SWAP_FUNC(32, s, d, nlink, struct squashfs_lipc_inode_header);\
+	SWAP_FUNC(32, s, d, xattr, struct squashfs_lipc_inode_header);\
 }
 
 #define _SQUASHFS_SWAP_DEV_INODE_HEADER(s, d, SWAP_FUNC) {\

squashfs-tools/unsquash-4.c

diff --git a/squashfs-tools/unsquash-4.c b/squashfs-tools/unsquash-4.c
index 47d1f65..cc40800 100644
--- a/squashfs-tools/unsquash-4.c
+++ b/squashfs-tools/unsquash-4.c
@@ -226,7 +226,7 @@
 			break;
 		case SQUASHFS_LFIFO_TYPE:
 		case SQUASHFS_LSOCKET_TYPE: {
-			squashfs_lipc_inode_header *inode = &header.lipc;
+			struct squashfs_lipc_inode_header *inode = &header.lipc;
 
 			SQUASHFS_SWAP_LIPC_INODE_HEADER(inode, block_ptr);