From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MbhMI-0000bz-Gr for mharc-grub-devel@gnu.org; Thu, 13 Aug 2009 16:57:14 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MbhMG-0000bA-Dw for grub-devel@gnu.org; Thu, 13 Aug 2009 16:57:12 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MbhMB-0000Vp-EZ for grub-devel@gnu.org; Thu, 13 Aug 2009 16:57:11 -0400 Received: from [199.232.76.173] (port=54173 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MbhMB-0000Vc-3K for grub-devel@gnu.org; Thu, 13 Aug 2009 16:57:07 -0400 Received: from xvm-190-8.ghst.net ([217.70.190.8]:38263 helo=aybabtu.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MbhMA-0001Xo-Io for grub-devel@gnu.org; Thu, 13 Aug 2009 16:57:06 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1MbhM7-0000XL-QL for grub-devel@gnu.org; Thu, 13 Aug 2009 22:57:05 +0200 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1MbhM1-00062g-2Z for grub-devel@gnu.org; Thu, 13 Aug 2009 22:56:57 +0200 Date: Thu, 13 Aug 2009 22:56:57 +0200 From: Robert Millan To: The development of GRUB 2 Message-ID: <20090813205657.GO22130@thorin> References: <20090813200014.GB22130@thorin> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: Re: [PATCH 1/2] Split ufs.mod into ufs1.mod and ufs2.mod X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Aug 2009 20:57:12 -0000 On Thu, Aug 13, 2009 at 10:12:34PM +0200, Vladimir 'phcoder' Serbinenko wrote: > > > > When you commit this, could you please follow logical order with > > ifdef/else/endif?  The negation is less intuitive to read. > Ok > > > >> +#ifdef MODE_UFS2 > >> +      grub_uint64_t indir[UFS_BLKSZ (sblock) / sizeof (grub_uint64_t)]; > >> +#else > >> +      grub_uint32_t indir[UFS_BLKSZ (sblock) / sizeof (grub_uint32_t)]; > >> +#endif > > > > Can this be made simpler by using typeof() ?  (same for the other one below) > > > I tried using sizeof (indir[0]) but it doesn't work since indir isn't > defined at that point. Ah, of course.. > >> -      return (data->ufs_type == UFS1) ? indir[blk] : indir[blk << 1]; > >> +      return indir[blk]; > > > > The blk bitshift was accounted for elsewhere? > > > By using correct type (grub_uint64_t vs grub_uint32_t) > > (Btw I assume you've tested > > on both filesystem types). > I tested on FreeBSD variants of UFS1 and UFS2. For Sun UFS1 I relied > on report by Seth Goldberg > >> -     ? dirent.namelen_bsd : grub_le_to_cpu16 (dirent.namelen); > >> +#ifdef MODE_UFS2 > >> +      namelen = dirent.namelen_bsd; > >> +#else > >> +      namelen = grub_le_to_cpu16 (dirent.namelen); > >> +#endif > > > > I wonder if there was a bug here (native endianess assumed for namelen_bsd?) > > > It's one byte Ok. Looks good to me then. Please remember about the ifndef/else/endif thing. -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."