git: c8eee7c0bf9a - main - ldd: renumber executable type constants

Ed Maste emaste at FreeBSD.org
Sat Jan 9 18:35:46 UTC 2021


The branch main has been updated by emaste:

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

commit c8eee7c0bf9a01303c75b4c3ac644b99adc70ca9
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-01-09 18:34:58 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
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"
 


More information about the dev-commits-src-all mailing list