ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 0dd1dd2f: am a57fb596: Merge "Remove no-op "capabilities"."

Browse source 
* commit '0dd1dd2f318c1ae7a9f1844625e7ff85a1119a88':
  Remove no-op "capabilities".
This commit is contained in:
Elliott Hughes 2015-04-01 18:58:39 +00:00 • committed by Android Git Automerger
commit d92e74bc5e
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
init/init_parser.cpp
View file

@ -122,7 +122,6 @@ static int lookup_keyword(const char *s)
break; break;
case 'c': case 'c':
if (!strcmp(s, "opy")) return K_copy; if (!strcmp(s, "opy")) return K_copy;
if (!strcmp(s, "apability")) return K_capability;
if (!strcmp(s, "lass")) return K_class; if (!strcmp(s, "lass")) return K_class;
if (!strcmp(s, "lass_start")) return K_class_start; if (!strcmp(s, "lass_start")) return K_class_start;
if (!strcmp(s, "lass_stop")) return K_class_stop; if (!strcmp(s, "lass_stop")) return K_class_stop;
@ -776,8 +775,6 @@ static void parse_line_service(struct parse_state *state, int nargs, char **args
kw = lookup_keyword(args[0]); kw = lookup_keyword(args[0]);
switch (kw) { switch (kw) {
case K_capability:
break;
case K_class: case K_class:
if (nargs != 2) { if (nargs != 2) {
parse_error(state, "class option requires a classname\n"); parse_error(state, "class option requires a classname\n");

1
init/keywords.h
View file

@ -45,7 +45,6 @@ int do_wait(int nargs, char **args);
enum { enum {
K_UNKNOWN, K_UNKNOWN,
#endif #endif
KEYWORD(capability, OPTION, 0, 0)
KEYWORD(class, OPTION, 0, 0) KEYWORD(class, OPTION, 0, 0)
KEYWORD(class_start, COMMAND, 1, do_class_start) KEYWORD(class_start, COMMAND, 1, do_class_start)
KEYWORD(class_stop, COMMAND, 1, do_class_stop) KEYWORD(class_stop, COMMAND, 1, do_class_stop)