History

kconfig: remove "enable"

Kconfig had a synonym "enable" for "select" that was neither documented nor used.

Adrian Bunk committed 18 years ago

Commit 9649ef81 parent 58fb0d42 files · +18 −21Browse files

Showing the changes to scripts (2 of 2 files). Show all

Unified · Split

2 files
  1. scripts/kconfig/zconf.gperf +0 −1
  2. scripts/kconfig/zconf.hash.c_shipped +18 −20
scripts/kconfig/zconf.gperf+0−1
@@ -35,7 +35,6 @@ int, T_TYPE, TF_COMMAND, S_INT · 34 unmodified lines
3535 hex, T_TYPE, TF_COMMAND, S_HEX
3636 string, T_TYPE, TF_COMMAND, S_STRING
3737 select, T_SELECT, TF_COMMAND
38−enable, T_SELECT, TF_COMMAND
3938 range, T_RANGE, TF_COMMAND
4039 option, T_OPTION, TF_COMMAND
4140 on, T_ON, TF_PARAM
scripts/kconfig/zconf.hash.c_shipped+18−20
@@ -1,4 +1,4 @@
1−/* ANSI-C code produced by gperf version 3.0.2 */
1+/* ANSI-C code produced by gperf version 3.0.3 */
22 /* Command-line: gperf */
33 /* Computed positions: -k'1,3' */
44
@@ -53,10 +53,10 @@ kconf_id_hash (register const char *str, register unsigned int len) · 48 unmodified lines
5353 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
5454 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
5555 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
56− 49, 49, 49, 49, 49, 49, 49, 35, 35, 5,
56+ 49, 49, 49, 49, 49, 49, 49, 49, 11, 5,
5757 0, 0, 5, 49, 5, 20, 49, 49, 5, 20,
5858 5, 0, 30, 49, 0, 15, 0, 10, 0, 49,
59− 10, 49, 49, 49, 49, 49, 49, 49, 49, 49,
59+ 25, 49, 49, 49, 49, 49, 49, 49, 49, 49,
6060 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
6161 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
6262 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
@@ -100,9 +100,10 @@ struct kconf_id_strings_t · 37 unmodified lines
100100 char kconf_id_strings_str12[sizeof("default")];
101101 char kconf_id_strings_str13[sizeof("def_bool")];
102102 char kconf_id_strings_str14[sizeof("help")];
103+ char kconf_id_strings_str15[sizeof("bool")];
103104 char kconf_id_strings_str16[sizeof("config")];
104105 char kconf_id_strings_str17[sizeof("def_tristate")];
105− char kconf_id_strings_str18[sizeof("hex")];
106+ char kconf_id_strings_str18[sizeof("boolean")];
106107 char kconf_id_strings_str19[sizeof("defconfig_list")];
107108 char kconf_id_strings_str21[sizeof("string")];
108109 char kconf_id_strings_str22[sizeof("if")];
@@ -113,12 +114,10 @@ struct kconf_id_strings_t · 4 unmodified lines
113114 char kconf_id_strings_str29[sizeof("menu")];
114115 char kconf_id_strings_str31[sizeof("source")];
115116 char kconf_id_strings_str32[sizeof("comment")];
117+ char kconf_id_strings_str33[sizeof("hex")];
116118 char kconf_id_strings_str35[sizeof("menuconfig")];
117119 char kconf_id_strings_str36[sizeof("prompt")];
118120 char kconf_id_strings_str37[sizeof("depends")];
119− char kconf_id_strings_str39[sizeof("bool")];
120− char kconf_id_strings_str41[sizeof("enable")];
121− char kconf_id_strings_str42[sizeof("boolean")];
122121 char kconf_id_strings_str48[sizeof("mainmenu")];
123122 };
124123 static struct kconf_id_strings_t kconf_id_strings_contents =
@@ -135,9 +134,10 @@ static struct kconf_id_strings_t kconf_id_strings_contents = · 10 unmodified lines
135134 "default",
136135 "def_bool",
137136 "help",
137+ "bool",
138138 "config",
139139 "def_tristate",
140− "hex",
140+ "boolean",
141141 "defconfig_list",
142142 "string",
143143 "if",
@@ -148,24 +148,25 @@ static struct kconf_id_strings_t kconf_id_strings_contents = · 4 unmodified lines
148148 "menu",
149149 "source",
150150 "comment",
151+ "hex",
151152 "menuconfig",
152153 "prompt",
153154 "depends",
154− "bool",
155− "enable",
156− "boolean",
157155 "mainmenu"
158156 };
159157 #define kconf_id_strings ((const char *) &kconf_id_strings_contents)
160158 #ifdef __GNUC__
161159 __inline
160+#ifdef __GNUC_STDC_INLINE__
161+__attribute__ ((__gnu_inline__))
162+#endif
162163 #endif
163164 struct kconf_id *
164165 kconf_id_lookup (register const char *str, register unsigned int len)
165166 {
166167 enum
167168 {
168− TOTAL_KEYWORDS = 32,
169+ TOTAL_KEYWORDS = 31,
169170 MIN_WORD_LENGTH = 2,
170171 MAX_WORD_LENGTH = 14,
171172 MIN_HASH_VALUE = 2,
@@ -188,10 +189,10 @@ kconf_id_lookup (register const char *str, register unsigned int len) · 16 unmodified lines
188189 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12, T_DEFAULT, TF_COMMAND, S_UNKNOWN},
189190 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13, T_DEFAULT, TF_COMMAND, S_BOOLEAN},
190191 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14, T_HELP, TF_COMMAND},
191− {-1},
192+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str15, T_TYPE, TF_COMMAND, S_BOOLEAN},
192193 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16, T_CONFIG, TF_COMMAND},
193194 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17, T_DEFAULT, TF_COMMAND, S_TRISTATE},
194− {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_TYPE, TF_COMMAND, S_HEX},
195+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_TYPE, TF_COMMAND, S_BOOLEAN},
195196 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str19, T_OPT_DEFCONFIG_LIST,TF_OPTION},
196197 {-1},
197198 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21, T_TYPE, TF_COMMAND, S_STRING},
@@ -205,16 +206,13 @@ kconf_id_lookup (register const char *str, register unsigned int len) · 7 unmodified lines
205206 {-1},
206207 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31, T_SOURCE, TF_COMMAND},
207208 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_COMMENT, TF_COMMAND},
208− {-1}, {-1},
209+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33, T_TYPE, TF_COMMAND, S_HEX},
210+ {-1},
209211 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35, T_MENUCONFIG, TF_COMMAND},
210212 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36, T_PROMPT, TF_COMMAND},
211213 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37, T_DEPENDS, TF_COMMAND},
214+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
212215 {-1},
213− {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str39, T_TYPE, TF_COMMAND, S_BOOLEAN},
214− {-1},
215− {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41, T_SELECT, TF_COMMAND},
216− {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42, T_TYPE, TF_COMMAND, S_BOOLEAN},
217− {-1}, {-1}, {-1}, {-1}, {-1},
218216 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str48, T_MAINMENU, TF_COMMAND}
219217 };
220218

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t