Commit 96a29581 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent a19937d8

scripts/genksyms/genksyms.c

+0 −18
Original line number Diff line number Diff line
@@ -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++;