Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dd1dd2f authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit 'a57fb596':
  Remove no-op "capabilities".
parents ffe5c0d1 a57fb596

init/init_parser.cpp

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

init/keywords.h

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