Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262011AbVDVH2z (ORCPT ); Fri, 22 Apr 2005 03:28:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262005AbVDVH06 (ORCPT ); Fri, 22 Apr 2005 03:26:58 -0400 Received: from mail.fh-wedel.de ([213.39.232.198]:7815 "EHLO moskovskaya.fh-wedel.de") by vger.kernel.org with ESMTP id S262011AbVDVHZd (ORCPT ); Fri, 22 Apr 2005 03:25:33 -0400 Date: Fri, 22 Apr 2005 09:25:33 +0200 From: =?iso-8859-1?Q?J=F6rn?= Engel To: Phillip Lougher Cc: linux-kernel@vger.kernel.org Subject: [PATCH 9/10] squashfs: first use of swabbing Message-ID: <20050422072533.GG10459@wohnheim.fh-wedel.de> References: <20050420065500.GA24213@wohnheim.fh-wedel.de> <20050421010817.GB29755@wohnheim.fh-wedel.de> <20050421011045.GC29755@wohnheim.fh-wedel.de> <20050421011126.GD29755@wohnheim.fh-wedel.de> <20050422072037.GB10459@wohnheim.fh-wedel.de> <20050422072200.GC10459@wohnheim.fh-wedel.de> <20050422072251.GD10459@wohnheim.fh-wedel.de> <20050422072355.GE10459@wohnheim.fh-wedel.de> <20050422072446.GF10459@wohnheim.fh-wedel.de> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20050422072446.GF10459@wohnheim.fh-wedel.de> User-Agent: Mutt/1.3.28i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2123 Lines: 68 J?rn -- To recognize individual spam features you have to try to get into the mind of the spammer, and frankly I want to spend as little time inside the minds of spammers as possible. -- Paul Graham Signed-off-by: J?rn Engel --- fs/squashfs/inode.c | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) --- linux-2.6.12-rc3cow/fs/squashfs/inode.c~squashfs_cu10 2005-04-22 09:06:09.550109088 +0200 +++ linux-2.6.12-rc3cow/fs/squashfs/inode.c 2005-04-22 09:15:50.279824752 +0200 @@ -122,7 +122,7 @@ static struct buffer_head *get_block_len int *cur_index, int *offset, int *c_byte) { squashfs_sb_info *msBlk = s->s_fs_info; - unsigned short temp; + u16 temp; struct buffer_head *bh; unsigned char *data; @@ -131,30 +131,19 @@ static struct buffer_head *get_block_len if (msBlk->devblksize - *offset == 1) { data = bh->b_data; - if (msBlk->swap) - ((unsigned char *) &temp)[1] = data[*offset]; - else - ((unsigned char *) &temp)[0] = data[*offset]; + ((unsigned char *) &temp)[0] = data[*offset]; brelse(bh); if (!(bh = sb_bread(s, ++(*cur_index)))) return NULL; data = bh->b_data; - if (msBlk->swap) - ((unsigned char *) &temp)[0] = data[0]; - else - ((unsigned char *) &temp)[1] = data[0]; - *c_byte = temp; + ((unsigned char *) &temp)[1] = data[0]; + *c_byte = (msBlk->swab16)(temp); *offset = 1; } else { data = bh->b_data; - if (msBlk->swap) { - ((unsigned char *) &temp)[1] = data[*offset]; - ((unsigned char *) &temp)[0] = data[*offset + 1]; - } else { - ((unsigned char *) &temp)[0] = data[*offset]; - ((unsigned char *) &temp)[1] = data[*offset + 1]; - } - *c_byte = temp; + ((unsigned char *) &temp)[0] = data[*offset]; + ((unsigned char *) &temp)[1] = data[*offset + 1]; + *c_byte = (msBlk->swab16)(temp); *offset += 2; } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/