From owner-dev-commits-src-all@freebsd.org Sat Jan 9 18:35:46 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BF4A74DF344; Sat, 9 Jan 2021 18:35:46 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DCpZB55YFz3rFS; Sat, 9 Jan 2021 18:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A1CA81A570; Sat, 9 Jan 2021 18:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 109IZkId023411; Sat, 9 Jan 2021 18:35:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 109IZk1X023410; Sat, 9 Jan 2021 18:35:46 GMT (envelope-from git) Date: Sat, 9 Jan 2021 18:35:46 GMT Message-Id: <202101091835.109IZk1X023410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c8eee7c0bf9a - main - ldd: renumber executable type constants MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8eee7c0bf9a01303c75b4c3ac644b99adc70ca9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2021 18:35:46 -0000 The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c8eee7c0bf9a01303c75b4c3ac644b99adc70ca9 commit c8eee7c0bf9a01303c75b4c3ac644b99adc70ca9 Author: Ed Maste AuthorDate: 2021-01-09 18:34:58 +0000 Commit: Ed Maste CommitDate: 2021-01-09 18:34:58 +0000 ldd: renumber executable type constants ldd had #defines for AOUT, ELF, and ELF32. The removal of AOUT left a possibly confusing gap. These are not used anywhere but this file so renumber to avoid the gap. Reported by: allanjude --- usr.bin/ldd/ldd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c index 892cf9bb3cc5..08c91d829bd7 100644 --- a/usr.bin/ldd/ldd.c +++ b/usr.bin/ldd/ldd.c @@ -72,9 +72,9 @@ static int is_executable(const char *fname, int fd, int *is_shlib, static void usage(void); #define TYPE_UNKNOWN 0 -#define TYPE_ELF 2 /* Architecture default */ +#define TYPE_ELF 1 /* Architecture default */ #if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED) -#define TYPE_ELF32 3 /* Explicit 32 bits on architectures >32 bits */ +#define TYPE_ELF32 2 /* Explicit 32 bits on architectures >32 bits */ #define _PATH_LDD32 "/usr/bin/ldd32"