* Deprecate `elf_getshnum()`, `elf_getphnum()` and `elf_getshstrndx()` in

  favour of `elf_getshdrnum()`, `elf_getphdrnum()` and `elf_getshdrstrndx()`
  respectively.
* Add new manual pages for `elf_getshdrstrndx()`, `elf_getphdrnum()` and
  `elf_getshdrnum()`.
* Add a deprecation warning for `elf_getshstrndx()`, `elf_getphnum()` and
  `elf_getshnum()`.

Obtained from:	elftoolchain
MFC after:		1 month

1 files changed, 18 insertions, 5 deletions

diff --git a/lib/libelf/elf_phnum.c b/lib/libelf/elf_phnum.c
index ff10c7e..4ec108e 100644
--- a/lib/libelf/elf_phnum.c
+++ b/lib/libelf/elf_phnum.c
@@ -32,8 +32,8 @@ __FBSDID("$FreeBSD$");
 
 #include "_libelf.h"
 
-int
-elf_getphnum(Elf *e, size_t *phnum)
+static int
+_libelf_getphdrnum(Elf *e, size_t *phnum)
 {
 	void *eh;
 	int ec;
@@ -41,13 +41,26 @@ elf_getphnum(Elf *e, size_t *phnum)
 	if (e == NULL || e->e_kind != ELF_K_ELF ||
 	    ((ec = e->e_class) != ELFCLASS32 && ec != ELFCLASS64)) {
 		LIBELF_SET_ERROR(ARGUMENT, 0);
-		return (0);
+		return (-1);
 	}
 
 	if ((eh = _libelf_ehdr(e, ec, 0)) == NULL)
-		return (0);
+		return (-1);
 
 	*phnum = e->e_u.e_elf.e_nphdr;
 
-	return (1);
+	return (0);
+}
+
+int
+elf_getphdrnum(Elf *e, size_t *phnum)
+{
+	return (_libelf_getphdrnum(e, phnum));
+}
+
+/* Deprecated API */
+int
+elf_getphnum(Elf *e, size_t *phnum)
+{
+	return (_libelf_getphdrnum(e, phnum) >= 0);
 }