mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 1/7] ubiformat: avoid macros in help text
Date: Thu, 26 Jun 2014 10:51:32 +0200	[thread overview]
Message-ID: <1403772698-10330-2-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1403772698-10330-1-git-send-email-s.hauer@pengutronix.de>

From: Jan Luebbe <jlu@pengutronix.de>

To simplify parsing of the help strings, we need to avoid using
macros there.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 commands/ubiformat.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/commands/ubiformat.c b/commands/ubiformat.c
index 5c8a363..443d645 100644
--- a/commands/ubiformat.c
+++ b/commands/ubiformat.c
@@ -26,7 +26,7 @@
  */
 #define MAX_CONSECUTIVE_BAD_BLOCKS 4
 
-#define PROGRAM_NAME    "ubiformat"
+#define PROGRAM_NAME	"ubiformat"
 
 #include <common.h>
 #include <command.h>
@@ -337,7 +337,7 @@ static int flash_image(const struct mtd_dev_info *mtd,
 		long long ec;
 
 		if (!args.quiet && !args.verbose) {
-			printf("\r" PROGRAM_NAME ": flashing eraseblock %d -- %2u %% complete  ",
+			printf("\rubiformat: flashing eraseblock %d -- %2u %% complete  ",
 			       eb, (eb + 1) * 100 / mtd->eb_cnt);
 		}
 
@@ -447,7 +447,7 @@ static int format(const struct mtd_dev_info *mtd,
 		long long ec;
 
 		if (!args.quiet && !args.verbose) {
-			printf("\r" PROGRAM_NAME ": formatting eraseblock %d -- %2u %% complete  ",
+			printf("\rubiformat: formatting eraseblock %d -- %2u %% complete  ",
 			       eb, (eb + 1 - start_eb) * 100 / (mtd->eb_cnt - start_eb));
 		}
 
@@ -781,8 +781,8 @@ BAREBOX_CMD_HELP_OPT("-Q NUM\t", "32-bit UBI image sequence number to use")
 BAREBOX_CMD_HELP_OPT("-q\t", "suppress progress percentage information")
 BAREBOX_CMD_HELP_OPT("-v\t", "be verbose")
 BAREBOX_CMD_HELP_TEXT("")
-BAREBOX_CMD_HELP_TEXT("Example 1: " PROGRAM_NAME " /dev/nand0 -y - format nand0 and assume yes")
-BAREBOX_CMD_HELP_TEXT("Example 2: " PROGRAM_NAME " /dev/nand0 -q -e 0 - format nand0,")
+BAREBOX_CMD_HELP_TEXT("Example 1: ubiformat /dev/nand0 -y - format nand0 and assume yes")
+BAREBOX_CMD_HELP_TEXT("Example 2: ubiformat /dev/nand0 -q -e 0 - format nand0,")
 BAREBOX_CMD_HELP_TEXT("\tbe quiet and force erase counter value 0.")
 BAREBOX_CMD_HELP_END
 
-- 
2.0.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2014-06-26  8:52 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-26  8:51 New Documentation for barebox Sascha Hauer
2014-06-26  8:51 ` Sascha Hauer [this message]
2014-06-26  8:51 ` [PATCH 2/7] automount: fix description typo Sascha Hauer
2014-06-26  8:51 ` [PATCH 3/7] commands: addpart: Improve description Sascha Hauer
2014-06-26  8:51 ` [PATCH 4/7] Documentation: remove doxygen documentation Sascha Hauer
2014-06-26  8:51 ` [PATCH 5/7] Documentation: remove remaining documentation Sascha Hauer
2014-06-26  8:51 ` [PATCH 6/7] Documentation: remove devicetree docs Sascha Hauer
2014-06-26  8:51 ` [PATCH 7/7] Documentation: Add new sphinxs docs Sascha Hauer
2014-06-26  9:02 ` New Documentation for barebox Holger Schurig
2014-06-26  9:09   ` Sascha Hauer
2014-06-26  9:36 ` Holger Schurig
2014-06-26 18:17   ` Sascha Hauer
2014-06-26  9:54 ` Holger Schurig
2014-06-26 10:01   ` Lucas Stach
2014-06-26 10:11     ` Holger Schurig
2014-06-26 10:28 ` Antony Pavlov
2014-06-26 15:36   ` Sascha Hauer
2014-06-26 10:31 ` Robert P. J. Day
2014-06-26 18:56   ` Sascha Hauer

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=1403772698-10330-2-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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