From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8CF6E138334 for ; Thu, 7 Jun 2018 14:09:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E2FCE0B14; Thu, 7 Jun 2018 14:09:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11EE8E0B14 for ; Thu, 7 Jun 2018 14:09:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A86E7335C97 for ; Thu, 7 Jun 2018 14:09:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34C8C2CB for ; Thu, 7 Jun 2018 14:09:41 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1528380350.5e0d247c72ce34e41520b93e3dd752fb75cf20a4.vapier@gentoo> Subject: [gentoo-commits] proj/pax-utils:master commit in: / X-VCS-Repository: proj/pax-utils X-VCS-Files: paxelf.c paxelf.h X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 5e0d247c72ce34e41520b93e3dd752fb75cf20a4 X-VCS-Branch: master Date: Thu, 7 Jun 2018 14:09:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 625b9e84-5f5d-4444-9dba-f9ae5b704d11 X-Archives-Hash: 75843ac02ed1d9633dad4a692adf2bc2 commit: 5e0d247c72ce34e41520b93e3dd752fb75cf20a4 Author: Mike Frysinger gentoo org> AuthorDate: Fri Mar 3 21:34:45 2017 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Jun 7 14:05:50 2018 +0000 URL: https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=5e0d247c paxelf: constify elfobj pointer in helpers This helper funcs only read data, so mark elfobj as const. paxelf.c | 20 ++++++++++---------- paxelf.h | 16 ++++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/paxelf.c b/paxelf.c index 9609cc1..59f50fd 100644 --- a/paxelf.c +++ b/paxelf.c @@ -86,7 +86,7 @@ static pairtype elf_etypes[] = { { 0, 0 } }; -unsigned int get_etype(elfobj *elf) +unsigned int get_etype(const elfobj *elf) { if (elf->elf_class == ELFCLASS32) return EGET(EHDR32(elf->ehdr)->e_type); @@ -94,12 +94,12 @@ unsigned int get_etype(elfobj *elf) return EGET(EHDR64(elf->ehdr)->e_type); } -const char *get_elfetype(elfobj *elf) +const char *get_elfetype(const elfobj *elf) { return find_pairtype(elf_etypes, get_etype(elf)); } -const char *get_endian(elfobj *elf) +const char *get_endian(const elfobj *elf) { switch (elf->data[EI_DATA]) { case ELFDATA2LSB: return "LE"; @@ -109,7 +109,7 @@ const char *get_endian(elfobj *elf) } /* translate elf EF_ defines -- tricky as it's based on EM_ */ -static unsigned int get_eflags(elfobj *elf) +static unsigned int get_eflags(const elfobj *elf) { if (elf->elf_class == ELFCLASS32) return EGET(EHDR32(elf->ehdr)->e_flags); @@ -117,7 +117,7 @@ static unsigned int get_eflags(elfobj *elf) return EGET(EHDR64(elf->ehdr)->e_flags); } -static int arm_eabi_poker(elfobj *elf) +static int arm_eabi_poker(const elfobj *elf) { unsigned int emachine, eflags; @@ -133,7 +133,7 @@ static int arm_eabi_poker(elfobj *elf) return -1; } -const char *get_elf_eabi(elfobj *elf) +const char *get_elf_eabi(const elfobj *elf) { static char buf[26]; int eabi = arm_eabi_poker(elf); @@ -144,7 +144,7 @@ const char *get_elf_eabi(elfobj *elf) return buf; } -const char *get_elfosabi(elfobj *elf) +const char *get_elfosabi(const elfobj *elf) { const char *str = get_elfeitype(EI_OSABI, elf->data[EI_OSABI]); if (strncmp(str, "ELFOSABI_", 9) == 0) @@ -279,7 +279,7 @@ static pairtype elf_emtypes[] = { { 0, 0 } }; -unsigned int get_emtype(elfobj *elf) +unsigned int get_emtype(const elfobj *elf) { if (elf->elf_class == ELFCLASS32) return EGET(EHDR32(elf->ehdr)->e_machine); @@ -287,7 +287,7 @@ unsigned int get_emtype(elfobj *elf) return EGET(EHDR64(elf->ehdr)->e_machine); } -const char *get_elfemtype(elfobj *elf) +const char *get_elfemtype(const elfobj *elf) { return find_pairtype(elf_emtypes, get_emtype(elf)); } @@ -784,7 +784,7 @@ const char *gnu_short_stack_flags(unsigned long flags) return buffer; } -const void *elf_findsecbyname(elfobj *elf, const char *name) +const void *elf_findsecbyname(const elfobj *elf, const char *name) { unsigned int i; const char *shdr_name; diff --git a/paxelf.h b/paxelf.h index f08839b..0742c40 100644 --- a/paxelf.h +++ b/paxelf.h @@ -60,11 +60,11 @@ extern elfobj *_readelf(const char *filename, int read_only); #define readelf(filename) _readelf(filename, 1) extern void unreadelf(elfobj *elf); extern const char *get_elfeitype(int ei_type, int type); -extern const char *get_elfetype(elfobj *elf); -extern const char *get_endian(elfobj *elf); -extern const char *get_elfosabi(elfobj *elf); -extern const char *get_elf_eabi(elfobj *elf); -extern const char *get_elfemtype(elfobj *elf); +extern const char *get_elfetype(const elfobj *elf); +extern const char *get_endian(const elfobj *elf); +extern const char *get_elfosabi(const elfobj *elf); +extern const char *get_elf_eabi(const elfobj *elf); +extern const char *get_elfemtype(const elfobj *elf); extern const char *get_elfptype(int type); extern const char *get_elfdtype(int type); extern const char *get_elfshntype(int type); @@ -73,9 +73,9 @@ extern const char *get_elfstbtype(int type); extern const char *get_elfstvtype(int type); extern const char *get_elfstttype(int type); extern const char *get_elfnttype(uint16_t e_type, const char *name, int type); -extern const void *elf_findsecbyname(elfobj *elf, const char *name); -extern unsigned int get_etype(elfobj *elf); -extern unsigned int get_emtype(elfobj *elf); +extern const void *elf_findsecbyname(const elfobj *elf, const char *name); +extern unsigned int get_etype(const elfobj *elf); +extern unsigned int get_emtype(const elfobj *elf); extern void print_etypes(FILE *); extern unsigned int etype_lookup(const char *);