Deleted Added
full compact
elf_phnum.c (165535) elf_phnum.c (210345)
1/*-
2 * Copyright (c) 2006 Joseph Koshy
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2006 Joseph Koshy
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/lib/libelf/elf_phnum.c 165535 2006-12-25 02:22:22Z jkoshy $");
28__FBSDID("$FreeBSD: head/lib/libelf/elf_phnum.c 210345 2010-07-21 12:14:50Z kaiw $");
29
30#include <ar.h>
31#include <libelf.h>
32
33#include "_libelf.h"
34
29
30#include <ar.h>
31#include <libelf.h>
32
33#include "_libelf.h"
34
35int
36elf_getphnum(Elf *e, size_t *phnum)
35static int
36_libelf_getphdrnum(Elf *e, size_t *phnum)
37{
38 void *eh;
39 int ec;
40
41 if (e == NULL || e->e_kind != ELF_K_ELF ||
42 ((ec = e->e_class) != ELFCLASS32 && ec != ELFCLASS64)) {
43 LIBELF_SET_ERROR(ARGUMENT, 0);
37{
38 void *eh;
39 int ec;
40
41 if (e == NULL || e->e_kind != ELF_K_ELF ||
42 ((ec = e->e_class) != ELFCLASS32 && ec != ELFCLASS64)) {
43 LIBELF_SET_ERROR(ARGUMENT, 0);
44 return (0);
44 return (-1);
45 }
46
47 if ((eh = _libelf_ehdr(e, ec, 0)) == NULL)
45 }
46
47 if ((eh = _libelf_ehdr(e, ec, 0)) == NULL)
48 return (0);
48 return (-1);
49
50 *phnum = e->e_u.e_elf.e_nphdr;
51
49
50 *phnum = e->e_u.e_elf.e_nphdr;
51
52 return (1);
52 return (0);
53}
53}
54
55int
56elf_getphdrnum(Elf *e, size_t *phnum)
57{
58 return (_libelf_getphdrnum(e, phnum));
59}
60
61/* Deprecated API */
62int
63elf_getphnum(Elf *e, size_t *phnum)
64{
65 return (_libelf_getphdrnum(e, phnum) >= 0);
66}