From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Petazzoni Date: Wed, 21 Dec 2011 08:41:22 +0100 Subject: [U-Boot] [PATCHv2 02/10] mkenvimage: correct and clarify comments and error messages In-Reply-To: <1324429105-10104-1-git-send-email-david.wagner@free-electrons.com> References: <1322080098-3151-3-git-send-email-david.wagner@free-electrons.com> <1324429105-10104-1-git-send-email-david.wagner@free-electrons.com> Message-ID: <20111221084122.0fbc7bff@skate> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Le Wed, 21 Dec 2011 01:58:25 +0100, David Wagner a ?crit : > +<<<<<<< HEAD > /* > * The right test to do is "=>" (not ">") because of the additional > * ending \0. See below. > @@ -201,6 +196,11 @@ int main(int argc, char **argv) > if (filesize >= envsize) { > fprintf(stderr, "The input file is larger than the " > "environment partition size\n"); > +======= > + /* The +1 is for the additionnal ending \0. See below. */ > + if (filesize + 1 > envsize) { > + fprintf(stderr, "The input file is larger than the environment partition size\n"); > +>>>>>>> mkenvimage: correct and clarify comments and error messages Seems like your forgot to resolve some conflicts. A compile test would have detected those issues. Regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com