From: Denys Vlasenko <dvlasenk@redhat.com>
Date: Fri, 19 Aug 2011 23:50:09 +0000 (+0200)
Subject: Don't return int from set_personality(), no one checks it.
X-Git-Tag: v4.7~316
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c774b2be4c64f24c8473d7bdf2ad23b8bc314cc;p=strace

Don't return int from set_personality(), no one checks it.

* defs.h (set_personality): Change return type to void.
* syscall.c (set_personality): Change return type to void.

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

diff --git a/defs.h b/defs.h
index b2c67aa9..9e2d395c 100644
--- a/defs.h
+++ b/defs.h
@@ -552,7 +552,7 @@ void perror_msg(const char *fmt, ...) __attribute__ ((format(printf, 1, 2)));
 void error_msg_and_die(const char *fmt, ...) __attribute__ ((noreturn, format(printf, 1, 2)));
 void perror_msg_and_die(const char *fmt, ...) __attribute__ ((noreturn, format(printf, 1, 2)));
 
-extern int set_personality(int personality);
+extern void set_personality(int personality);
 extern const char *xlookup(const struct xlat *, int);
 extern struct tcb *alloc_tcb(int, int);
 extern struct tcb *pid2tcb(int);
diff --git a/syscall.c b/syscall.c
index d6d4697f..8a77ec2e 100644
--- a/syscall.c
+++ b/syscall.c
@@ -183,9 +183,9 @@ const int personality_wordsize[SUPPORTED_PERSONALITIES] = {
 #if SUPPORTED_PERSONALITIES > 2
 	PERSONALITY2_WORDSIZE,
 #endif
-};;
+};
 
-int
+void
 set_personality(int personality)
 {
 	switch (personality) {
@@ -213,7 +213,7 @@ set_personality(int personality)
 		nsignals = nsignals1;
 		qual_flags = qual_flags1;
 		break;
-#endif /* SUPPORTED_PERSONALITIES >= 2 */
+#endif
 
 #if SUPPORTED_PERSONALITIES >= 3
 	case 2:
@@ -227,14 +227,10 @@ set_personality(int personality)
 		nsignals = nsignals2;
 		qual_flags = qual_flags2;
 		break;
-#endif /* SUPPORTED_PERSONALITIES >= 3 */
-
-	default:
-		return -1;
+#endif
 	}
 
 	current_personality = personality;
-	return 0;
 }