From nobody Fri May 02 07:34:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZpjNT42jDz5vHH0; Fri, 02 May 2025 07:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZpjNT2dz0z3rpv; Fri, 02 May 2025 07:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746171257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=syV1NVXuBDms6cPI2SVSeIXM9CEF3mr/aJ+vrz7QkH0=; b=DxJ5/wfL4dS4ERfJqwWYSC6qIY7riGzWa5RGURpTvhHJcsCVHPhSID+lbUCVYdK3+XAK9R Qc+28/eLvPf+ZdxOaek8by7QRmC5FpceeMQ6Hm2a3FxqxTxrMo6CBLZyy2IHYRks9f9HjW /RZPA+jR9rG0ALBvYK6kBlWrYbyOpoEUHmeLirmZYp8+Ef+q0yPGOUHYT9tZzhCj44koGW 2NcbFRoOgRqqKoYm+wlnDvIDfk0qhHN2hJxqyTHayYyhwl8+2uuQ4CBs6i8/Hc7sr50IaJ YNim3OeqcuXcumYQWbPyXt8PJxk2rAvwQQgRPWVjuuFtVmTHX8DqXkD4SZDEvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746171257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=syV1NVXuBDms6cPI2SVSeIXM9CEF3mr/aJ+vrz7QkH0=; b=cKvgq8bNViYIdhqDyVoWGeSPOdX/4BamKZySVEfd11goBei2LmsOUxJWahSYDbRypNFkzQ i1gTPtH05zf/5ILmSUNh1hwSFd8ihO3lMc8Lj/kxyEB3lVspPfUBPvl2DCOb8EY75/SEzc lLYwesqPTPwCA/Jr5s5FtwppSrwu0GqSZPAKekVEdTRpPmxdIrr3JgKa9t3YtY6EIoi8sE pZEu0yH5cweZNWnFm+aP21gprjynLLG4InW4cXp8zQPyMcReepXW1XAb0blDjcujsRi4qZ wlx9oyexdOsDiXEnoqHdXoNbBlBKBOwMTOk/Z/04/sSxtAa4WeQkdK6LMV7VMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746171257; a=rsa-sha256; cv=none; b=mh1MvCjmYflZicpEQ2DRrIwPKKNeFicYjNuBZkQGpetL5mIGGCIJhm79TMou3HvAO1Msjz 7lDR4WfZj+PYz4Db1usdkArVpoIHmc9X+Qj+l6kr/6atu4jL2VePxwKTpmqJjee8ok2Y0y 2ujC1lbY+ZK75mtrD6c6oPM4EMtnqF5FKI8xXICRT4xINuli+DjEPlDnBjZ4V81oL1HRUs YBnacA/h4qjget++tJyY9V7x3SJa6WZ1FYAOkPNkRaI9zZJyiQ3Yovl5ki++xRp12C0OHa vnpXlW13u0jc40JN9atwWW1iNvQP0zNbVAb9iZmRDv6JE6miqxv3WaNLQoGJDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZpjNT235tz13pK; Fri, 02 May 2025 07:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5427YH6v081029; Fri, 2 May 2025 07:34:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5427YHhO081026; Fri, 2 May 2025 07:34:17 GMT (envelope-from git) Date: Fri, 2 May 2025 07:34:17 GMT Message-Id: <202505020734.5427YHhO081026@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 30e5802aeffa - main - rtld: apply some style to dlopen_object() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30e5802aeffa435b29604afac45ab8aecf6ca92e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=30e5802aeffa435b29604afac45ab8aecf6ca92e commit 30e5802aeffa435b29604afac45ab8aecf6ca92e Author: Konstantin Belousov AuthorDate: 2025-05-01 17:19:32 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-02 07:32:56 +0000 rtld: apply some style to dlopen_object() Sponsored by: The FreeBSD Foundation --- libexec/rtld-elf/rtld.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index fa96a516687e..137d27528b46 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3809,7 +3809,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, obj = load_object(name, fd, refobj, lo_flags); } - if (obj) { + if (obj != NULL) { obj->dl_refcount++; if (mode & RTLD_GLOBAL && objlist_find(&list_global, obj) == NULL) @@ -3821,8 +3821,8 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, if ((lo_flags & RTLD_LO_DEEPBIND) != 0) obj->deepbind = true; result = 0; - if ((lo_flags & (RTLD_LO_EARLY | RTLD_LO_IGNSTLS)) == - 0 && + if ((lo_flags & (RTLD_LO_EARLY | + RTLD_LO_IGNSTLS)) == 0 && obj->static_tls && !allocate_tls_offset(obj)) { _rtld_error( "%s: No space available for static Thread Local Storage", @@ -3845,7 +3845,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, lockstate) == -1) { dlopen_cleanup(obj, lockstate); obj = NULL; - } else if (lo_flags & RTLD_LO_EARLY) { + } else if ((lo_flags & RTLD_LO_EARLY) != 0) { /* * Do not call the init functions for early * loaded filtees. The image is still not @@ -3900,10 +3900,9 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, distribute_static_tls(&initlist, lockstate); } - if (initlist_objects_ifunc(&initlist, - (mode & RTLD_MODEMASK) == RTLD_NOW, - (lo_flags & RTLD_LO_EARLY) ? SYMLOOK_EARLY : 0, - lockstate) == -1) { + if (initlist_objects_ifunc(&initlist, (mode & RTLD_MODEMASK) == + RTLD_NOW, (lo_flags & RTLD_LO_EARLY) ? SYMLOOK_EARLY : 0, + lockstate) == -1) { objlist_clear(&initlist); dlopen_cleanup(obj, lockstate); if (lockstate == &mlockstate) @@ -3911,7 +3910,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, return (NULL); } - if (!(lo_flags & RTLD_LO_EARLY)) { + if ((lo_flags & RTLD_LO_EARLY) == 0) { /* Call the init functions. */ objlist_call_init(&initlist, lockstate); }