summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2013-01-02 18:09:30 +0000
committeradrian <adrian@FreeBSD.org>2013-01-02 18:09:30 +0000
commit0e8a98ac713c9a0bdf5a44423b49d94902866c25 (patch)
tree2c5581928eda25e2ea4e30c604cd358df2c8dfbc /tools
parentedb42d2f964e7d982660a6d42087bd4a8cefff3d (diff)
downloadFreeBSD-src-0e8a98ac713c9a0bdf5a44423b49d94902866c25.zip
FreeBSD-src-0e8a98ac713c9a0bdf5a44423b49d94902866c25.tar.gz
* Add missing format specifier for err()
* add missing exit(0) * Fix some operator evaluation complaints. Thanks to: clang
Diffstat (limited to 'tools')
-rw-r--r--tools/tools/ath/athdecode/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/tools/ath/athdecode/main.c b/tools/tools/ath/athdecode/main.c
index 1ab5c6d..701f835 100644
--- a/tools/tools/ath/athdecode/main.c
+++ b/tools/tools/ath/athdecode/main.c
@@ -69,7 +69,7 @@ main(int argc, char *argv[])
filename = argv[1];
fd = open(filename, O_RDONLY);
if (fd < 0)
- err(1, filename);
+ err(1, "open: %s", filename);
if (fstat(fd, &sb) < 0)
err(1, "fstat");
addr = mmap(0, sb.st_size, PROT_READ, MAP_PRIVATE|MAP_NOCORE, fd, 0);
@@ -192,6 +192,7 @@ opmark(FILE *fd, int i, const struct athregrec *r)
fprintf(fd, "mark #%u value %u/0x%x", r->reg, r->val, r->val);
break;
}
+ exit(0);
}
#include "ah_devid.h"
@@ -302,8 +303,8 @@ register_regs(struct dumpreg *chipregs, u_int nchipregs,
*/
if (nr->addr == r->addr &&
(nr->name == r->name ||
- nr->name != NULL && r->name != NULL &&
- strcmp(nr->name, r->name) == 0)) {
+ (nr->name != NULL && r->name != NULL &&
+ strcmp(nr->name, r->name) == 0))) {
if (nr->srevMin < r->srevMin &&
(r->srevMin <= nr->srevMax &&
nr->srevMax+1 <= r->srevMax)) {
OpenPOWER on IntegriCloud