diff options
| author | dim <dim@FreeBSD.org> | 2014-02-23 23:33:11 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-02-23 23:33:11 +0000 |
| commit | e42ec49846c3cc1c4e569ef2fe94c6a98409dee1 (patch) | |
| tree | 142295e92ba823367fe65cd7a81b595d339851b4 /usr.bin | |
| parent | 30b3f33f96ea15c79777bcbfdf19881842e93540 (diff) | |
| parent | c0bb2e6d46cf4cd5c28cf0b99d652a5e685e2f7b (diff) | |
| download | FreeBSD-src-e42ec49846c3cc1c4e569ef2fe94c6a98409dee1.zip FreeBSD-src-e42ec49846c3cc1c4e569ef2fe94c6a98409dee1.tar.gz | |
Merge from head up to r262415.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/dtc/fdt.cc | 1 | ||||
| -rw-r--r-- | usr.bin/hexdump/parse.c | 7 | ||||
| -rw-r--r-- | usr.bin/kdump/kdump.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/dtc/fdt.cc b/usr.bin/dtc/fdt.cc index 0599d55..988a339 100644 --- a/usr.bin/dtc/fdt.cc +++ b/usr.bin/dtc/fdt.cc @@ -1059,6 +1059,7 @@ device_tree::parse_roots(input_buffer &input, std::vector<node*> &roots) { valid = false; } + input.next_token(); } } diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c index b10ce01..10db904 100644 --- a/usr.bin/hexdump/parse.c +++ b/usr.bin/hexdump/parse.c @@ -210,7 +210,6 @@ rewrite(FS *fs) int nconv, prec; size_t len; - nextpr = NULL; prec = 0; for (fu = fs->nextfu; fu; fu = fu->nextfu) { @@ -218,13 +217,11 @@ rewrite(FS *fs) * Break each format unit into print units; each conversion * character gets its own. */ + nextpr = &fu->nextpr; for (nconv = 0, fmtp = fu->fmt; *fmtp; nextpr = &pr->nextpr) { if ((pr = calloc(1, sizeof(PR))) == NULL) err(1, NULL); - if (!fu->nextpr) - fu->nextpr = pr; - else - *nextpr = pr; + *nextpr = pr; /* Skip preceding text and up to the next % sign. */ for (p1 = fmtp; *p1 && *p1 != '%'; ++p1); diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 3a9ba0e..cf05f24 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -1877,7 +1877,7 @@ ktrcapfail(struct ktr_cap_fail *ktr) /* operation on fd with insufficient capabilities */ printf("operation requires "); capname(&ktr->cap_needed); - printf(", process holds "); + printf(", descriptor holds "); capname(&ktr->cap_held); break; case CAPFAIL_INCREASE: |
