From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Sun, 20 Oct 2024 10:23:42 +0000 (+0200)
Subject: libkmod: Inline elf_get_strings_section
X-Git-Tag: v34~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4d7593818a9f347978620cae2629e223bd75a9e;p=thirdparty%2Fkmod.git

libkmod: Inline elf_get_strings_section

Its only caller can do the processing directly (kmod_elf_new).

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/196
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---

diff --git a/libkmod/libkmod-elf.c b/libkmod/libkmod-elf.c
index ade39c29..2fb215d7 100644
--- a/libkmod/libkmod-elf.c
+++ b/libkmod/libkmod-elf.c
@@ -246,12 +246,6 @@ fail:
 	return -EINVAL;
 }
 
-static const char *elf_get_strings_section(const struct kmod_elf *elf, uint64_t *size)
-{
-	*size = elf->header.strings.size;
-	return elf_get_mem(elf, elf->header.strings.offset);
-}
-
 struct kmod_elf *kmod_elf_new(const void *memory, off_t size)
 {
 	struct kmod_elf *elf;
@@ -333,8 +327,8 @@ struct kmod_elf *kmod_elf_new(const void *memory, off_t size)
 		ELFDBG(elf, "could not get strings section\n");
 		goto invalid;
 	} else {
-		uint64_t slen;
-		const char *s = elf_get_strings_section(elf, &slen);
+		uint64_t slen = elf->header.strings.size;
+		const char *s = elf_get_mem(elf, elf->header.strings.offset);
 		if (slen == 0 || s[slen - 1] != '\0') {
 			ELFDBG(elf, "strings section does not end with \\0\n");
 			goto invalid;