summaryrefslogtreecommitdiffstats
path: root/scripts/basic
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-01-11 22:05:46 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-01-18 09:37:39 +0900
commitab9ce9feed362f3f51e239f9421b220aaf9211aa (patch)
tree4f4ed4dd6bb13b5ce56ed71f1ef84097ff081e6c /scripts/basic
parent87b95a81357dd6ec679a786cebfe34d0e797f752 (diff)
downloadlinux-ab9ce9feed362f3f51e239f9421b220aaf9211aa.tar.gz
linux-ab9ce9feed362f3f51e239f9421b220aaf9211aa.tar.bz2
linux-ab9ce9feed362f3f51e239f9421b220aaf9211aa.zip
fixdep: use existing helper to check modular CONFIG options
str_ends_with() tests if the given token ends with a particular string. Currently, it is used to check file paths without $(srctree). Actually, we have one more place where this helper is useful. Use it to check if CONFIG option ends with _MODULE. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts/basic')
-rw-r--r--scripts/basic/fixdep.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 0abc15778f56..fa3d39b6f23b 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -219,6 +219,17 @@ static void use_config(const char *m, int slen)
print_config(m, slen);
}
+/* test if s ends in sub */
+static int str_ends_with(const char *s, int slen, const char *sub)
+{
+ int sublen = strlen(sub);
+
+ if (sublen > slen)
+ return 0;
+
+ return !memcmp(s + slen - sublen, sub, sublen);
+}
+
static void parse_config_file(const char *p)
{
const char *q, *r;
@@ -228,7 +239,7 @@ static void parse_config_file(const char *p)
q = p;
while (*q && (isalnum(*q) || *q == '_'))
q++;
- if (memcmp(q - 7, "_MODULE", 7) == 0)
+ if (str_ends_with(p, q - p, "_MODULE"))
r = q - 7;
else
r = q;
@@ -238,17 +249,6 @@ static void parse_config_file(const char *p)
}
}
-/* test if s ends in sub */
-static int str_ends_with(const char *s, int slen, const char *sub)
-{
- int sublen = strlen(sub);
-
- if (sublen > slen)
- return 0;
-
- return !memcmp(s + slen - sublen, sub, sublen);
-}
-
static void *read_file(const char *filename)
{
struct stat st;