svn commit: r244962 - head/tools/tools/ath/athdecode

[Adrian Chadd]

Author: adrian
Date: Wed Jan  2 18:09:30 2013
New Revision: 244962
URL: http://svnweb.freebsd.org/changeset/base/244962

Log:
  * Add missing format specifier for err()
  * add missing exit(0)
  * Fix some operator evaluation complaints.
  
  Thanks to: clang

Modified:
  head/tools/tools/ath/athdecode/main.c

Modified: head/tools/tools/ath/athdecode/main.c
==============================================================================
--- head/tools/tools/ath/athdecode/main.c	Wed Jan  2 18:05:31 2013	(r244961)
+++ head/tools/tools/ath/athdecode/main.c	Wed Jan  2 18:09:30 2013	(r244962)
@@ -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 ath
 		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, 
 			 */
 			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)) {