diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-22 14:36:14 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-22 14:36:14 +1000 |
commit | 4e982498dc6b90f10b9966746944582807e57277 (patch) | |
tree | 47eebd278195f15abf3ae444c5376bd9d741e316 /scripts/dtc/dtc.h | |
parent | 6747c0596a5cd94af8036b7950e0ea26da908f2a (diff) | |
parent | 4760597116e34bd58f670d008ae7323653268fb4 (diff) |
Merge remote-tracking branch 'dt-rh/for-next'
Diffstat (limited to 'scripts/dtc/dtc.h')
-rw-r--r-- | scripts/dtc/dtc.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/dtc/dtc.h b/scripts/dtc/dtc.h index 264a20cf66a8..56212c8df660 100644 --- a/scripts/dtc/dtc.h +++ b/scripts/dtc/dtc.h @@ -38,9 +38,9 @@ #include "util.h" #ifdef DEBUG -#define debug(fmt,args...) printf(fmt, ##args) +#define debug(...) printf(__VA_ARGS__) #else -#define debug(fmt,args...) +#define debug(...) #endif @@ -88,7 +88,7 @@ struct data { }; -#define empty_data ((struct data){ /* all .members = 0 or NULL */ }) +#define empty_data ((struct data){ 0 /* all .members = 0 or NULL */ }) #define for_each_marker(m) \ for (; (m); (m) = (m)->next) @@ -118,7 +118,7 @@ struct data data_append_align(struct data d, int align); struct data data_add_marker(struct data d, enum markertype type, char *ref); -int data_is_one_string(struct data d); +bool data_is_one_string(struct data d); /* DT constraints */ @@ -127,13 +127,13 @@ int data_is_one_string(struct data d); /* Live trees */ struct label { - int deleted; + bool deleted; char *label; struct label *next; }; struct property { - int deleted; + bool deleted; char *name; struct data val; @@ -143,7 +143,7 @@ struct property { }; struct node { - int deleted; + bool deleted; char *name; struct property *proplist; struct node *children; @@ -247,8 +247,8 @@ void sort_tree(struct boot_info *bi); /* Checks */ -void parse_checks_option(bool warn, bool error, const char *optarg); -void process_checks(int force, struct boot_info *bi); +void parse_checks_option(bool warn, bool error, const char *arg); +void process_checks(bool force, struct boot_info *bi); /* Flattened trees */ |