From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Halcrow Subject: [PATCH 11/11] eCryptfs: Replace magic numbers Date: Mon, 17 Sep 2007 16:52:04 -0500 Message-ID: <20070917215204.GS13679@halcrow.austin.ibm.com> References: <20070917214436.GH13679@halcrow.austin.ibm.com> Reply-To: Michael Halcrow Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ecryptfs-devel@lists.sourceforge.net To: akpm@linux-foundation.org Return-path: Content-Disposition: inline In-Reply-To: <20070917214436.GH13679@halcrow.austin.ibm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ecryptfs-devel-bounces@lists.sourceforge.net Errors-To: ecryptfs-devel-bounces@lists.sourceforge.net List-Id: linux-fsdevel.vger.kernel.org Replace some magic numbers with sizeof() equivalents. Signed-off-by: Michael Halcrow --- fs/ecryptfs/crypto.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index 3b3cf27..425a144 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -1426,10 +1426,10 @@ static int parse_header_metadata(struct ecryptfs_crypt_stat *crypt_stat, u32 header_extent_size; u16 num_header_extents_at_front; - memcpy(&header_extent_size, virt, 4); + memcpy(&header_extent_size, virt, sizeof(u32)); header_extent_size = be32_to_cpu(header_extent_size); - virt += 4; - memcpy(&num_header_extents_at_front, virt, 2); + virt += sizeof(u32); + memcpy(&num_header_extents_at_front, virt, sizeof(u16)); num_header_extents_at_front = be16_to_cpu(num_header_extents_at_front); crypt_stat->num_header_extents_at_front = (int)num_header_extents_at_front; -- 1.5.1.6 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/