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 D656313835A for ; Fri, 16 Apr 2021 19:26:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1BA8E0822; Fri, 16 Apr 2021 19:26:51 +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 D1379E081A for ; Fri, 16 Apr 2021 19:26:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 D84A2340BE3 for ; Fri, 16 Apr 2021 19:26:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A9DB66A for ; Fri, 16 Apr 2021 19:26:49 +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: <1618601053.f06cd2cdb8dd0bcfd02356fae1c0604cf7fc7f54.vapier@gentoo> Subject: [gentoo-commits] proj/pax-utils:master commit in: / X-VCS-Repository: proj/pax-utils X-VCS-Files: dumpelf.c X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: f06cd2cdb8dd0bcfd02356fae1c0604cf7fc7f54 X-VCS-Branch: master Date: Fri, 16 Apr 2021 19:26:49 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2f9865ed-ff7e-4ca2-aa5d-8e4cfbb67896 X-Archives-Hash: 1d30117b80f70b2541f07f77832c48b1 commit: f06cd2cdb8dd0bcfd02356fae1c0604cf7fc7f54 Author: Mike Frysinger chromium org> AuthorDate: Fri Apr 16 19:24:13 2021 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Fri Apr 16 19:24:13 2021 +0000 URL: https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=f06cd2cd dumpelf: constify elfobj in APIs Signed-off-by: Mike Frysinger gentoo.org> dumpelf.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dumpelf.c b/dumpelf.c index 342251f..4742a50 100644 --- a/dumpelf.c +++ b/dumpelf.c @@ -11,17 +11,15 @@ const char argv0[] = "dumpelf"; #include "paxinc.h" /* prototypes */ -static void dump_ehdr(elfobj *elf, const void *ehdr); -static void dump_phdr(elfobj *elf, const void *phdr, size_t phdr_cnt); -static void dump_shdr(elfobj *elf, const void *shdr, size_t shdr_cnt, const char *section_name); -static void dump_dyn(elfobj *elf, const void *dyn, size_t dyn_cnt); +static void dump_ehdr(const elfobj *elf, const void *ehdr); +static void dump_phdr(const elfobj *elf, const void *phdr, size_t phdr_cnt); +static void dump_shdr(const elfobj *elf, const void *shdr, size_t shdr_cnt, const char *section_name); +static void dump_dyn(const elfobj *elf, const void *dyn, size_t dyn_cnt); #if 0 -static void dump_sym(elfobj *elf, const void *sym); -static void dump_rel(elfobj *elf, const void *rel); -static void dump_rela(elfobj *elf, const void *rela); +static void dump_sym(const elfobj *elf, const void *sym); +static void dump_rel(const elfobj *elf, const void *rel); +static void dump_rela(const elfobj *elf, const void *rela); #endif -static void usage(int status); -static void parseargs(int argc, char *argv[]); /* variables to control behavior */ static char be_verbose = 0; @@ -30,7 +28,7 @@ static char be_verbose = 0; static const void *phdr_dynamic_void; /* dump all internal elf info */ -static void dumpelf(elfobj *elf, size_t file_cnt) +static void dumpelf(const elfobj *elf, size_t file_cnt) { size_t i, b; @@ -158,7 +156,7 @@ static void dumpelf_file(const char *filename, size_t file_cnt) unreadelf(elf); } -static void dump_ehdr(elfobj *elf, const void *ehdr_void) +static void dump_ehdr(const elfobj *elf, const void *ehdr_void) { #define DUMP_EHDR(B) \ if (elf->elf_class == ELFCLASS ## B) { \ @@ -208,7 +206,7 @@ static void dump_ehdr(elfobj *elf, const void *ehdr_void) DUMP_EHDR(64) } -static void dump_notes(elfobj *elf, size_t B, const void *memory, const void *memory_end) +static void dump_notes(const elfobj *elf, size_t B, const void *memory, const void *memory_end) { /* While normally we'd worry about Elf32_Nhdr vs Elf64_Nhdr, in the ELF * world, the two structs are exactly the same. So avoid ugly CPP. @@ -299,7 +297,7 @@ static const char *dump_p_flags(uint32_t type, uint32_t flags) return buf + 3; } -static void dump_phdr(elfobj *elf, const void *phdr_void, size_t phdr_cnt) +static void dump_phdr(const elfobj *elf, const void *phdr_void, size_t phdr_cnt) { #define DUMP_PHDR(B) \ if (elf->elf_class == ELFCLASS ## B) { \ @@ -356,7 +354,7 @@ static const char *timestamp(uint64_t stamp) return buf; } -static void dump_shdr(elfobj *elf, const void *shdr_void, size_t shdr_cnt, const char *section_name) +static void dump_shdr(const elfobj *elf, const void *shdr_void, size_t shdr_cnt, const char *section_name) { size_t i; @@ -488,7 +486,7 @@ static void dump_shdr(elfobj *elf, const void *shdr_void, size_t shdr_cnt, const DUMP_SHDR(64) } -static void dump_dyn(elfobj *elf, const void *dyn_void, size_t dyn_cnt) +static void dump_dyn(const elfobj *elf, const void *dyn_void, size_t dyn_cnt) { #define DUMP_DYN(B) \ if (elf->elf_class == ELFCLASS ## B) { \