From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Frysinger Date: Tue, 17 Mar 2009 14:09:00 -0400 Subject: [U-Boot] [PATCH] NAND: Have nboot accept .e and .i as legacy no-ops. In-Reply-To: <20090317175518.GA15222@ld0162-tx32.am.freescale.net> References: <20090317171015.GA14806@ld0162-tx32.am.freescale.net> <200903171349.22010.vapier@gentoo.org> <20090317175518.GA15222@ld0162-tx32.am.freescale.net> Message-ID: <200903171409.01700.vapier@gentoo.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Tuesday 17 March 2009 13:55:18 Scott Wood wrote: > On Tue, Mar 17, 2009 at 01:49:20PM -0400, Mike Frysinger wrote: > > On Tuesday 17 March 2009 13:10:15 Scott Wood wrote: > > > --- a/common/cmd_nand.c > > > +++ b/common/cmd_nand.c > > > @@ -502,7 +502,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, > > > nand_info_t *nand, > > > > > > s = strchr(cmd, '.'); > > > if (s != NULL && > > > - (strcmp(s, ".jffs2") && !strcmp(s, ".e") && !strcmp(s, ".i"))) { > > > + (strcmp(s, ".jffs2") && strcmp(s, ".e") && strcmp(s, ".i"))) { > > > > unrelated to the bug in question, but perhaps better written like: > > if (s++ != NULL && > > (strcmp(s, "jffs2") && strcmp(s, "e") && strcmp(s, "i"))) { > > That'd make s non-NULL and invalid, if it started out as NULL. Even if s > is not referenced again, it's not a nice thing to leave lurking in the > code. i know it does, but since s isnt used again in the code in the NULL case, it doesnt matter. but if you want to be pedantic, it's easy enough to split the operations. if (s != NULL && ++s && .... -mike -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. Url : http://lists.denx.de/pipermail/u-boot/attachments/20090317/6f863368/attachment.pgp