From: Denys Vlasenko <dvlasenk@redhat.com>
Date: Fri, 19 Aug 2011 16:06:46 +0000 (+0200)
Subject: Make addflags return void
X-Git-Tag: v4.7~323
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4924dbd6d750665cf383b20ab4fd67e48219ab91;p=strace

Make addflags return void

* defs.h (addflags): Change return type from int to void.
* util.c (addflags): Change return type from int to void.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
---

diff --git a/defs.h b/defs.h
index 64e4da08..80c8c830 100644
--- a/defs.h
+++ b/defs.h
@@ -572,7 +572,7 @@ extern int trace_syscall(struct tcb *);
 extern int count_syscall(struct tcb *, struct timeval *);
 extern void printxval(const struct xlat *, int, const char *);
 extern int printargs(struct tcb *);
-extern int addflags(const struct xlat *, int);
+extern void addflags(const struct xlat *, int);
 extern int printflags(const struct xlat *, int, const char *);
 extern const char *sprintflags(const char *, const struct xlat *, int);
 extern int umoven(struct tcb *, long, int, char *);
diff --git a/util.c b/util.c
index 44f12c2d..bfa2856a 100644
--- a/util.c
+++ b/util.c
@@ -279,27 +279,22 @@ printllval(struct tcb *tcp, const char *format, int llarg)
  * print the entries whose bits are on in `flags'
  * return # of flags printed.
  */
-int
+void
 addflags(const struct xlat *xlat, int flags)
 {
-	int n;
-
-	for (n = 0; xlat->str; xlat++) {
+	for (; xlat->str; xlat++) {
 		if (xlat->val && (flags & xlat->val) == xlat->val) {
 			tprintf("|%s", xlat->str);
 			flags &= ~xlat->val;
-			n++;
 		}
 	}
 	if (flags) {
 		tprintf("|%#x", flags);
-		n++;
 	}
-	return n;
 }
 
 /*
- * Interpret `xlat' as an array of flags/
+ * Interpret `xlat' as an array of flags.
  * Print to static string the entries whose bits are on in `flags'
  * Return static string.
  */