From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 22 Nov 2016 01:46:07 +0000 (+0000)
Subject: tests: cleanup prctl-name.c
X-Git-Tag: v4.15~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=994afa8b711aa163b02483edf3b8a57b70ba357d;p=strace

tests: cleanup prctl-name.c

* tests/prctl-name.c (main): Remove "len" variable, rename "len1"
to "len".  Remove "name1" variable, use "name" instead.
---

diff --git a/tests/prctl-name.c b/tests/prctl-name.c
index fe93965e..308c275f 100644
--- a/tests/prctl-name.c
+++ b/tests/prctl-name.c
@@ -44,54 +44,53 @@ int
 main(void)
 {
 	static const char str[] = "0123456789abcdef";
-	static const int len = sizeof(str);
-	static const int len1 = len - 1;
-	char *const name = tail_memdup(str, len);
-	char *const name1 = name + 1;
+	static const int len = sizeof(str) - 1;
+	char *name = tail_memdup(str, sizeof(str));
 	int i;
 	int rc;
 
 	rc = prctl(PR_SET_NAME, NULL);
 	printf("prctl(PR_SET_NAME, NULL) = %s\n", sprintrc(rc));
 
-	for (i = 0; i <= len1; ++i) {
-		rc = prctl(PR_SET_NAME, name + len1 - i);
+	for (i = 0; i <= len; ++i) {
+		rc = prctl(PR_SET_NAME, name + len - i);
 		printf("prctl(PR_SET_NAME, \"%.*s\"%s) = %s\n",
-		       i < len1 - 1 ? i : len1 - 1,
-		       str + len1 - i,
-		       i < len1 - 1 ? "" : "...",
+		       i < len - 1 ? i : len - 1,
+		       str + len - i,
+		       i < len - 1 ? "" : "...",
 		       sprintrc(rc));
 	}
 
-	name[0] = -1;
-	memcpy(name1, str, len1);
+	*name = -1;
+	++name;
+	memcpy(name, str, len);
 
-	for (i = 0; i <= len1; ++i) {
-		rc = prctl(PR_SET_NAME, name1 + len1 - i);
-		if (i < len1 - 1)
+	for (i = 0; i <= len; ++i) {
+		rc = prctl(PR_SET_NAME, name + len - i);
+		if (i < len - 1)
 			printf("prctl(PR_SET_NAME, %p) = %s\n",
-			       name1 + len1 - i, sprintrc(rc));
+			       name + len - i, sprintrc(rc));
 		else
 			printf("prctl(PR_SET_NAME, \"%.*s\"...) = %s\n",
-			       len1 - 1, str + len1 - i, sprintrc(rc));
+			       len - 1, str + len - i, sprintrc(rc));
 	}
 
 	rc = prctl(PR_GET_NAME, NULL);
 	printf("prctl(PR_GET_NAME, NULL) = %s\n", sprintrc(rc));
 
-	for (i = 0; i < len1; ++i) {
-		rc = prctl(PR_GET_NAME, name1 + len1 - i);
+	for (i = 0; i < len; ++i) {
+		rc = prctl(PR_GET_NAME, name + len - i);
 		printf("prctl(PR_GET_NAME, %p) = %s\n",
-		       name1 + len1 - i, sprintrc(rc));
+		       name + len - i, sprintrc(rc));
 	}
 
-	rc = prctl(PR_GET_NAME, name1);
+	rc = prctl(PR_GET_NAME, name);
 	if (rc)
 		printf("prctl(PR_GET_NAME, %p) = %s\n",
-		       name1, sprintrc(rc));
+		       name, sprintrc(rc));
 	else
 		printf("prctl(PR_GET_NAME, \"%.*s\") = %s\n",
-		       len1 - 1, name1, sprintrc(rc));
+		       len - 1, name, sprintrc(rc));
 
 	puts("+++ exited with 0 +++");
 	return 0;