genksyms: remove the remnant of the -s option
PATCH 1/2 genksyms: remove the remnant of the -s option
Commit 74d931716151 ("genksyms: remove symbol prefix support") removed the -s (--symbol-prefix) option.
Clean up the left-over.
Signed-off-by Masahiro Yamada <[email protected]>
---
scripts/genksyms/genksyms.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
scripts/genksyms/genksyms.c +2 -4
@@ -719,7 +719,6 @@ static void genksyms_usage(void) {fputs ("Usage:\n" "genksyms [-adDTwqhVR] > /path/to/.tmp_obj.ver\n" "\n" #ifdef __GNU_LIBRARY__ -" -s, --symbol-prefix Select symbol prefix\n" " -d, --debug Increment the debug level (repeatable)\n" " -D, --dump Dump expanded symbol defs (for debugging only)\n" " -r, --reference file Read reference symbols from a file\n"
@@ -730,7 +729,6 @@ static void genksyms_usage(void)" -h, --help Print this message\n" " -V, --version Print the release version\n"#else /* __GNU_LIBRARY__ */ -" -s Select symbol prefix\n" " -d Increment the debug level (repeatable)\n" " -D Dump expanded symbol defs (for debugging only)\n" " -r file Read reference symbols from a file\n"
@@ -763,10 +761,10 @@ int main(int argc, char **argv) {0, 0, 0, 0} }; -while ((o =getopt_long (argc, argv,"s:dwqVDr:T:ph" , +while ((o =getopt_long (argc, argv,"dwqVDr:T:ph" , &long_opts[0 ],NULL )) !=EOF ) #else /* __GNU_LIBRARY__ */ - while ((o = getopt(argc, argv, "s:dwqVDr:T:ph")) != EOF) + while ((o = getopt(argc, argv, "dwqVDr:T:ph")) != EOF)#endif /* __GNU_LIBRARY__ */ switch (o) {case 'd' :
Signature · 1 line
2.40.1
PATCH 2/2 genksyms: use getopt_long() unconditionally
getopt_long() is used by various tools in the kernel (e.g. Kconfig).
It should be fine to use it all the time.
Signed-off-by Masahiro Yamada <[email protected]>
---
scripts/genksyms/genksyms.c | 18 ------------------ 1 file changed, 18 deletions(-)
scripts/genksyms/genksyms.c +0 -18
@@ -16,9 +16,7 @@#include <unistd.h> #include <assert.h> #include <stdarg.h> -#ifdef __GNU_LIBRARY__#include <getopt.h> -#endif /* __GNU_LIBRARY__ */ #include "genksyms.h" /*----------------------------------------------------------------------*/
@@ -718,7 +716,6 @@ void error_with_pos(const char *fmt, ...)static void genksyms_usage (void ) {fputs ("Usage:\n" "genksyms [-adDTwqhVR] > /path/to/.tmp_obj.ver\n" "\n" -#ifdef __GNU_LIBRARY__" -d, --debug Increment the debug level (repeatable)\n" " -D, --dump Dump expanded symbol defs (for debugging only)\n" " -r, --reference file Read reference symbols from a file\n"
@@ -728,17 +725,6 @@ static void genksyms_usage(void)" -q, --quiet Disable warnings (default)\n" " -h, --help Print this message\n" " -V, --version Print the release version\n" -#else /* __GNU_LIBRARY__ */ -" -d Increment the debug level (repeatable)\n" -" -D Dump expanded symbol defs (for debugging only)\n" -" -r file Read reference symbols from a file\n" -" -T file Dump expanded types into file\n" -" -p Preserve reference modversions or fail\n" -" -w Enable warnings\n" -" -q Disable warnings (default)\n" -" -h Print this message\n" -" -V Print the release version\n" -#endif /* __GNU_LIBRARY__ */ , stderr); }
@@ -747,7 +733,6 @@ int main(int argc, char **argv)FILE *dumpfile =NULL , *ref_file =NULL ;int o; -#ifdef __GNU_LIBRARY__struct option long_opts[] = { {"debug" ,0 ,0 ,'d' }, {"warnings" ,0 ,0 ,'w' },
@@ -763,9 +748,6 @@ int main(int argc, char **argv)while ((o =getopt_long (argc, argv,"dwqVDr:T:ph" , &long_opts[0 ],NULL )) !=EOF ) -#else /* __GNU_LIBRARY__ */ - while ((o = getopt(argc, argv, "dwqVDr:T:ph")) != EOF) -#endif /* __GNU_LIBRARY__ */ switch (o) {case 'd' : flag_debug++;
Signature · 1 line
2.40.1