All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 09/10] Correctly handle input files beginning with several newlines
       [not found] <1322080098-3151-0-git-send-email-david.wagner@free-electrons.com>
@ 2011-12-21  0:59 ` David Wagner
  2012-01-05 16:24   ` Wolfgang Denk
  0 siblings, 1 reply; 2+ messages in thread
From: David Wagner @ 2011-12-21  0:59 UTC (permalink / raw)
  To: u-boot

Also, fix some comments (minor)

Signed-off-by: David Wagner <david.wagner@free-electrons.com>
---
 tools/mkenvimage.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c
index 9899631..0c9194b 100644
--- a/tools/mkenvimage.c
+++ b/tools/mkenvimage.c
@@ -224,18 +224,18 @@ int main(int argc, char **argv)
 	/* Replace newlines separating variables with \0 */
 	for (fp = 0, ep = 0 ; fp < filesize ; fp++) {
 		if (filebuf[fp] == '\n') {
-			if (fp == 0) {
+			if (ep == 0) {
 				/*
-				 * Newline at the beginning of the file ?
-				 * Ignore it.
+				 * Newlines@the beginning of the file ?
+				 * Ignore them.
 				 */
 				continue;
 			} else if (filebuf[fp-1] == '\\') {
 				/*
 				 * Embedded newline in a variable.
 				 *
-				 * The backslash was added to the envptr ;
-				 * rewind and replace it with a newline
+				 * The backslash was added to the envptr; rewind
+				 * and replace it with a newline
 				 */
 				ep--;
 				envptr[ep++] = '\n';
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [U-Boot] [PATCH 09/10] Correctly handle input files beginning with several newlines
  2011-12-21  0:59 ` [U-Boot] [PATCH 09/10] Correctly handle input files beginning with several newlines David Wagner
@ 2012-01-05 16:24   ` Wolfgang Denk
  0 siblings, 0 replies; 2+ messages in thread
From: Wolfgang Denk @ 2012-01-05 16:24 UTC (permalink / raw)
  To: u-boot

Dear David Wagner,

In message <1324429169-10177-1-git-send-email-david.wagner@free-electrons.com> you wrote:
> Also, fix some comments (minor)
> 
> Signed-off-by: David Wagner <david.wagner@free-electrons.com>
> ---
>  tools/mkenvimage.c |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Sorry, but my karma just ran over your dogma.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-01-05 16:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <1322080098-3151-0-git-send-email-david.wagner@free-electrons.com>
2011-12-21  0:59 ` [U-Boot] [PATCH 09/10] Correctly handle input files beginning with several newlines David Wagner
2012-01-05 16:24   ` Wolfgang Denk

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.