diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-01 18:37:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-01 18:37:06 +0000 |
| commit | a57fb596f31ae415446841b35dd8aefe8273b409 (patch) | |
| tree | d2414641512133f0b4b8f449394305ae97d3528a /init | |
| parent | 27cda9a535c80470e913156e412cbf7e60c3217c (diff) | |
| parent | b022b8428c98ec41224813070d5561258a46495a (diff) | |
| download | system_core-a57fb596f31ae415446841b35dd8aefe8273b409.zip system_core-a57fb596f31ae415446841b35dd8aefe8273b409.tar.gz system_core-a57fb596f31ae415446841b35dd8aefe8273b409.tar.bz2 | |
Merge "Remove no-op "capabilities"."
Diffstat (limited to 'init')
| -rw-r--r-- | init/init_parser.cpp | 3 | ||||
| -rw-r--r-- | init/keywords.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/init/init_parser.cpp b/init/init_parser.cpp index 4e18e20..593f0c5 100644 --- a/init/init_parser.cpp +++ b/init/init_parser.cpp @@ -122,7 +122,6 @@ static int lookup_keyword(const char *s) break; case 'c': 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_start")) return K_class_start; 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]); switch (kw) { - case K_capability: - break; case K_class: if (nargs != 2) { parse_error(state, "class option requires a classname\n"); diff --git a/init/keywords.h b/init/keywords.h index 34cb2ad..4bd0ba6 100644 --- a/init/keywords.h +++ b/init/keywords.h @@ -45,7 +45,6 @@ int do_wait(int nargs, char **args); enum { K_UNKNOWN, #endif - KEYWORD(capability, OPTION, 0, 0) KEYWORD(class, OPTION, 0, 0) KEYWORD(class_start, COMMAND, 1, do_class_start) KEYWORD(class_stop, COMMAND, 1, do_class_stop) |