From: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
To: linux-modules@vger.kernel.org
Cc: aris@redhat.com, Lucas De Marchi <lucas.demarchi@intel.com>,
yauheni.kaliuta@redhat.com
Subject: [PATCH RFC 2/3] depmod: search key: move builtin detection under the add function
Date: Wed, 23 Nov 2016 17:23:38 +0200 [thread overview]
Message-ID: <20161123152339.27531-3-yauheni.kaliuta@redhat.com> (raw)
In-Reply-To: <20161123152339.27531-1-yauheni.kaliuta@redhat.com>
Prepare to implement external directories support.
It's better to isolated behaviour difference under the
cfg_search_add() call, then make the client code aware of it.
In case of external modules/directories support, there will be
one more keyword added, so making the clients aware of it makes
even less sense.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
---
tools/depmod.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/depmod.c b/tools/depmod.c
index a96501d1cbfb..81360a651811 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -452,10 +452,11 @@ struct cfg {
struct cfg_search *searches;
};
-static int cfg_search_add(struct cfg *cfg, const char *path, uint8_t builtin)
+static int cfg_search_add(struct cfg *cfg, const char *path)
{
struct cfg_search *s;
size_t len;
+ uint8_t builtin = streq(path, CFG_BUILTIN_KEY);
if (builtin)
len = 0;
@@ -568,8 +569,7 @@ static int cfg_file_parse(struct cfg *cfg, const char *filename)
if (streq(cmd, "search")) {
const char *sp;
while ((sp = strtok_r(NULL, "\t ", &saveptr)) != NULL) {
- uint8_t builtin = streq(sp, CFG_BUILTIN_KEY);
- cfg_search_add(cfg, sp, builtin);
+ cfg_search_add(cfg, sp);
}
} else if (streq(cmd, "override")) {
const char *modname = strtok_r(NULL, "\t ", &saveptr);
@@ -763,7 +763,7 @@ static int cfg_load(struct cfg *cfg, const char * const *cfg_paths)
* list here. But only if there was no "search" option specified.
*/
if (cfg->searches == NULL)
- cfg_search_add(cfg, "updates", 0);
+ cfg_search_add(cfg, "updates");
return 0;
}
--
2.9.3
next prev parent reply other threads:[~2016-11-23 15:22 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-23 15:23 [PATCH RFC 0/3] depmod: implement external directories support Yauheni Kaliuta
2016-11-23 15:23 ` [PATCH RFC 1/3] depmod: create depmod dir independent search function Yauheni Kaliuta
2017-05-09 6:56 ` Lucas De Marchi
2016-11-23 15:23 ` Yauheni Kaliuta [this message]
2017-05-09 7:04 ` [PATCH RFC 2/3] depmod: search key: move builtin detection under the add function Lucas De Marchi
2016-11-23 15:23 ` [PATCH RFC 3/3] depmod: implement external directories support Yauheni Kaliuta
2017-03-18 21:46 ` [PATCH RFC 0/3] " Yauheni Kaliuta
2017-05-09 7:51 ` Lucas De Marchi
2017-05-09 8:50 ` Yauheni Kaliuta
2017-05-09 19:09 ` [PATCHv2 0/4] " Yauheni Kaliuta
2017-05-09 19:09 ` [PATCHv2 1/4] depmod: create depmod dir independent search function Yauheni Kaliuta
2017-06-02 2:18 ` Lucas De Marchi
2017-05-09 19:09 ` [PATCHv2 2/4] depmod: rewrite depmod modules search with scratchbuf Yauheni Kaliuta
2017-06-02 3:23 ` Lucas De Marchi
2017-05-09 19:09 ` [PATCHv2 3/4] depmod: implement external directories support Yauheni Kaliuta
2017-06-02 3:30 ` Lucas De Marchi
2017-05-09 19:09 ` [PATCHv2 4/4] testsuite: add tests for external directory support Yauheni Kaliuta
2017-06-02 4:03 ` Lucas De Marchi
2017-06-02 4:05 ` [PATCHv2 0/4] depmod: implement external directories support Lucas De Marchi
2017-06-20 9:11 ` Yauheni Kaliuta
2017-07-19 18:07 ` Lucas De Marchi
2017-07-19 18:57 ` Yauheni Kaliuta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161123152339.27531-3-yauheni.kaliuta@redhat.com \
--to=yauheni.kaliuta@redhat.com \
--cc=aris@redhat.com \
--cc=linux-modules@vger.kernel.org \
--cc=lucas.demarchi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).