[Crosstoolchain-logs] [device-tree-compiler] 06/29: Replace FDT_VERSION() with stringify()

[Vagrant Cascadian]

This is an automated email from the git hooks/post-receive script.

vagrant pushed a commit to branch debian/master
in repository device-tree-compiler.

commit 2d45d1c5c65e9b3cd020fac624ed9bf6c2855a91
Author: David Gibson <david at gibson.dropbear.id.au>
Date:   Wed Oct 18 16:55:08 2017 +1100

    Replace FDT_VERSION() with stringify()
    
    The FDT_VERSION() and _FDT_VERSION() macros don't really have anything
    specific to do with the fdt version.  Rather, they're the common CPP
    "stringify" idiom.  Move to util.h and rename to stringify() to
    reflect this.
    
    Signed-off-by: David Gibson <david at gibson.dropbear.id.au>
---
 dtc.c  | 4 +---
 util.h | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dtc.c b/dtc.c
index 5ed873c..1655b2f 100644
--- a/dtc.c
+++ b/dtc.c
@@ -59,8 +59,6 @@ static void fill_fullpaths(struct node *tree, const char *prefix)
 }
 
 /* Usage related data. */
-#define FDT_VERSION(version)	_FDT_VERSION(version)
-#define _FDT_VERSION(version)	#version
 static const char usage_synopsis[] = "dtc [options] <input file>";
 static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:a:fb:i:H:sW:E:@Ahv";
 static struct option const usage_long_opts[] = {
@@ -98,7 +96,7 @@ static const char * const usage_opts_help[] = {
 	 "\t\tdts - device tree source text\n"
 	 "\t\tdtb - device tree blob\n"
 	 "\t\tasm - assembler source",
-	"\n\tBlob version to produce, defaults to "FDT_VERSION(DEFAULT_FDT_VERSION)" (for dtb and asm output)",
+	"\n\tBlob version to produce, defaults to "stringify(DEFAULT_FDT_VERSION)" (for dtb and asm output)",
 	"\n\tOutput dependency file",
 	"\n\tMake space for <number> reserve map entries (for dtb and asm output)",
 	"\n\tMake the blob at least <bytes> long (extra space)",
diff --git a/util.h b/util.h
index ad5f411..ea62715 100644
--- a/util.h
+++ b/util.h
@@ -35,6 +35,9 @@
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
+#define stringify(s)	stringify_(s)
+#define stringify_(s)	#s
+
 static inline void NORETURN PRINTF(1, 2) die(const char *str, ...)
 {
 	va_list ap;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/crosstoolchain/device-tree-compiler.git