From patchwork Sun May 24 15:42:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11567487 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D8541159A for ; Sun, 24 May 2020 15:44:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0D5F207CB for ; Sun, 24 May 2020 15:44:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590335095; bh=xKPHzKay6k2r3n50d4X2uT2Nz8qgig7Im1XmCOjd64w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AbH9TnpSwKKiCtUq9/npDXMCxm65+IpcMiGZFHs4upHANEWEcYz1yYBmHkP+Ptd6j A53iKD8F1AkML5MKCWy00bcePRzGTAT+YxQ2OteWShEQcsaok96Z/0Cbi8WeEdaodD XyOuVz2vY5eCQ9xSnSdrUWCM6X9pFZyFewSSW67U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388032AbgEXPoo (ORCPT ); Sun, 24 May 2020 11:44:44 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:19701 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728399AbgEXPnX (ORCPT ); Sun, 24 May 2020 11:43:23 -0400 Received: from oscar.flets-west.jp (softbank126090202047.bbtec.net [126.90.202.47]) (authenticated) by conuserg-09.nifty.com with ESMTP id 04OFgcUr017561; Mon, 25 May 2020 00:42:42 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 04OFgcUr017561 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1590334963; bh=gluhb44Vf90fefpnqsQIOxJvzgiBOySQWJIDyHg2TIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tZ40vNoqZTyVt9fDzB5L/0JQ33WeXl80xFBRGUg3dFZCB8kNqa+Q3CijBFEcbML4s XTVuZG3IDt/5cw/8jn+oNJOvql2D9fP+uEg8rc72re6+ZplGCFIQJxVEcFYDeZY6eK o4Az8ib2EmnavXXu4TBO+Spky+mWaPwzLDR05WpIeHD6HAqYgYhFmjGK0XKezbGz9N 0opsvafBUqi+xcBJ1EQlJFC5USvTbsUZWZThBKhE76SS5GR9M2bYjq2TGlOz3RVrrj zOird6UzzIW4so4ykSKtG+HdxbWLQWCqBD5dNt65FenCdC5UJZtzA+czbUld6T4ukE 6v6aI1LXKtLEQ== X-Nifty-SrcIP: [126.90.202.47] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 08/29] modpost: remove get_next_text() and make {grab,release_}file static Date: Mon, 25 May 2020 00:42:14 +0900 Message-Id: <20200524154235.380482-9-masahiroy@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200524154235.380482-1-masahiroy@kernel.org> References: <20200524154235.380482-1-masahiroy@kernel.org> MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org get_next_line() is no longer used. Remove. grab_file() and release_file() are only used in modpost.c. Make them static. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/mod/modpost.c | 38 ++------------------------------------ scripts/mod/modpost.h | 3 --- 2 files changed, 2 insertions(+), 39 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 40c6414aaeec..33cdb78a4ba1 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -462,7 +462,7 @@ static void sym_set_crc(const char *name, unsigned int crc) s->crc_valid = 1; } -void *grab_file(const char *filename, unsigned long *size) +static void *grab_file(const char *filename, unsigned long *size) { struct stat st; void *map = MAP_FAILED; @@ -484,41 +484,7 @@ void *grab_file(const char *filename, unsigned long *size) return map; } -/** - * Return a copy of the next line in a mmap'ed file. - * spaces in the beginning of the line is trimmed away. - * Return a pointer to a static buffer. - **/ -char *get_next_line(unsigned long *pos, void *file, unsigned long size) -{ - static char line[4096]; - int skip = 1; - size_t len = 0; - signed char *p = (signed char *)file + *pos; - char *s = line; - - for (; *pos < size ; (*pos)++) { - if (skip && isspace(*p)) { - p++; - continue; - } - skip = 0; - if (*p != '\n' && (*pos < size)) { - len++; - *s++ = *p++; - if (len > 4095) - break; /* Too long, stop */ - } else { - /* End of string */ - *s = '\0'; - return line; - } - } - /* End of buffer */ - return NULL; -} - -void release_file(void *file, unsigned long size) +static void release_file(void *file, unsigned long size) { munmap(file, size); } diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index dfadaa0c01ec..232a0e11fcaa 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -192,9 +192,6 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen); /* from modpost.c */ char *read_text_file(const char *filename); char *get_line(char **stringp); -void *grab_file(const char *filename, unsigned long *size); -char* get_next_line(unsigned long *pos, void *file, unsigned long size); -void release_file(void *file, unsigned long size); enum loglevel { LOG_WARN,