Re: [U-Boot] [PATCHv2 02/10] mkenvimage: correct and clarify comments and error messages

Le Wed, 21 Dec 2011 01:58:25 +0100, David Wagner david.wagner@free-electrons.com 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