Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 24 Mar 2021 22:40:26 GMT
From:      Mariusz Zaborski <oshogbo@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 852a88a1d925 - main - rtld: style nits
Message-ID:  <202103242240.12OMeQGC089957@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
The branch main has been updated by oshogbo:

URL: https://cgit.FreeBSD.org/src/commit/?id=852a88a1d92500028f1364a4afc58955190db7a5

commit 852a88a1d92500028f1364a4afc58955190db7a5
Author:     Mariusz Zaborski <oshogbo@FreeBSD.org>
AuthorDate: 2021-03-24 21:05:39 +0000
Commit:     Mariusz Zaborski <oshogbo@FreeBSD.org>
CommitDate: 2021-03-24 22:40:48 +0000

    rtld: style nits
    
    No functional change intended.
    
    Requested by:   kib
---
 libexec/rtld-elf/rtld.c | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index b186bebbfefc..3ecf50b8cf5d 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -2470,30 +2470,31 @@ load_needed_objects(Obj_Entry *first, int flags)
 static int
 load_preload_objects(void)
 {
-    char *p = ld_preload;
-    Obj_Entry *obj;
-    static const char delim[] = " \t:;";
-
-    if (p == NULL)
-	return 0;
+	char *p = ld_preload;
+	Obj_Entry *obj;
+	static const char delim[] = " \t:;";
 
-    p += strspn(p, delim);
-    while (*p != '\0') {
-	size_t len = strcspn(p, delim);
-	char savech;
+	if (p == NULL)
+		return (0);
 
-	savech = p[len];
-	p[len] = '\0';
-	obj = load_object(p, -1, NULL, 0);
-	if (obj == NULL)
-	    return -1;	/* XXX - cleanup */
-	obj->z_interpose = true;
-	p[len] = savech;
-	p += len;
 	p += strspn(p, delim);
-    }
-    LD_UTRACE(UTRACE_PRELOAD_FINISHED, NULL, NULL, 0, 0, NULL);
-    return 0;
+	while (*p != '\0') {
+		size_t len = strcspn(p, delim);
+		char savech;
+
+		savech = p[len];
+		p[len] = '\0';
+		obj = load_object(p, -1, NULL, 0);
+		if (obj == NULL)
+			return (-1);	/* XXX - cleanup */
+		obj->z_interpose = true;
+		p[len] = savech;
+		p += len;
+		p += strspn(p, delim);
+	}
+	LD_UTRACE(UTRACE_PRELOAD_FINISHED, NULL, NULL, 0, 0, NULL);
+
+	return (0);
 }
 
 static const char *

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103242240.12OMeQGC089957>