From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCHv2 02/10] mkenvimage: correct and clarify comments and error messages
Date: Wed, 21 Dec 2011 08:41:22 +0100 [thread overview]
Message-ID: <20111221084122.0fbc7bff@skate> (raw)
In-Reply-To: <1324429105-10104-1-git-send-email-david.wagner@free-electrons.com>
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
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
next prev parent reply other threads:[~2011-12-21 7:41 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-23 20:28 [U-Boot] [PATCH 0/9] mkenvimage: v10/v11 diff split into several patches David Wagner
2011-11-23 20:28 ` [U-Boot] [PATCH 1/9] Strip mkenvimage David Wagner
2012-01-13 20:03 ` Wolfgang Denk
2011-11-23 20:28 ` [U-Boot] [PATCH 2/9] mkenvimage: correct and clarify comments and error messages David Wagner
2011-12-21 0:58 ` [U-Boot] [PATCHv2 02/10] " David Wagner
2011-12-21 7:41 ` Thomas Petazzoni [this message]
2011-12-21 22:10 ` David Wagner
2011-11-23 20:28 ` [U-Boot] [PATCH 3/9] mkenvimage: Correct the includes and add a missing one David Wagner
2011-12-21 0:58 ` [U-Boot] [PATCHv2 03/10] " David Wagner
2012-01-05 16:28 ` Wolfgang Denk
2012-01-05 18:44 ` [U-Boot] [PATCHv2 1/8] Strip mkenvimage David Wagner
2012-01-05 18:44 ` [U-Boot] [PATCHv3 2/8] mkenvimage: correct and clarify comments and error messages David Wagner
2012-01-05 18:44 ` [U-Boot] [PATCHv3 3/8] mkenvimage: Correct the includes and add a missing one David Wagner
2012-01-08 6:48 ` Mike Frysinger
2012-01-08 13:08 ` [U-Boot] [PATCHv4 3/8] mkenvimage: Correct an include " David Wagner
2012-01-08 19:09 ` Mike Frysinger
2012-01-05 18:44 ` [U-Boot] [PATCHv2 4/8] mkenvimage: More error handling David Wagner
2012-01-08 6:49 ` Mike Frysinger
2012-01-08 14:25 ` [U-Boot] [PATCHv3 " David Wagner
2012-01-08 19:17 ` Mike Frysinger
2012-01-08 19:50 ` [U-Boot] [PATCHv4 " David Wagner
2012-01-05 18:44 ` [U-Boot] [PATCHv3 5/8] mkenvimage: Read/Write from/to stdin/out by default or if the filename is "-" David Wagner
2012-01-08 6:50 ` Mike Frysinger
2012-01-08 12:02 ` David Wagner
2012-01-08 19:29 ` Mike Frysinger
2012-01-05 18:44 ` [U-Boot] [PATCHv2 6/8] mkenvimage: Use mmap() when reading from a regular file David Wagner
2012-01-08 6:51 ` Mike Frysinger
2012-01-08 13:09 ` [U-Boot] [PATCHv3 " David Wagner
2012-01-05 18:44 ` [U-Boot] [PATCHv2 7/8] mkenvimage: Don't try to detect comments in the input file David Wagner
2012-01-05 18:44 ` [U-Boot] [PATCHv3 8/8] mkenvimage: Really set the redundant byte when applicable David Wagner
2012-01-08 6:46 ` [U-Boot] [PATCHv2 1/8] Strip mkenvimage Mike Frysinger
2011-11-23 20:28 ` [U-Boot] [PATCH 4/9] mkenvimage: More error handling David Wagner
2011-11-23 20:28 ` [U-Boot] [PATCH 5/9] mkenvimage: Read from stdin if the filename is "-" David Wagner
2011-11-27 10:24 ` [U-Boot] [PATCHv2 5/8] mkenvimage: Read/Write from/to stdin/out by default or " David Wagner
2011-11-23 20:28 ` [U-Boot] [PATCH 6/9] mkenvimage: Use mmap() when reading from a regular file David Wagner
2011-11-23 20:28 ` [U-Boot] [PATCH 7/9] mkenvimage: Don't try to detect comments in the input file David Wagner
2011-11-23 20:28 ` [U-Boot] [PATCH 8/9] mkenvimage: Really set the redundant byte when applicable David Wagner
2011-11-25 21:36 ` Mike Frysinger
2011-11-27 10:26 ` [U-Boot] [PATCHv2 8/8] " David Wagner
2011-11-23 20:28 ` [U-Boot] [PATCH 9/9] mkenvimage: Default to stdout if the output argument is absent or "-" David Wagner
2011-11-25 21:36 ` Mike Frysinger
2011-11-27 10:26 ` David Wagner
2011-11-27 19:59 ` [U-Boot] [PATCH 0/9] mkenvimage: v10/v11 diff split into several patches Mike Frysinger
2011-12-21 1:04 ` David Wagner
2011-12-21 8:46 ` Stefano Babic
2012-01-13 20:07 ` Wolfgang Denk
2012-01-13 23:22 ` David Wagner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111221084122.0fbc7bff@skate \
--to=thomas.petazzoni@free-electrons.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox