update .gitignore

[elogind.git] / src / udev / udev-rules.c

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 73e17c65c0f12b00af114eb810b6016046b545d2..4e85760bd4402a388573463e426ac362edcadf37 100644 (file)
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -781,7 +781,6 @@ static int import_program_into_properties(struct udev_event *event, const char *
 
 static int import_parent_into_properties(struct udev_device *dev, const char *filter)
 {
-        struct udev *udev = udev_device_get_udev(dev);
         struct udev_device *dev_parent;
         struct udev_list_entry *list_entry;
 
@@ -969,7 +968,7 @@ static int get_key(struct udev *udev, char **line, char **key, enum operation_ty
 }
 
 /* extract possible KEY{attr} */
-static char *get_key_attribute(struct udev *udev, char *str)
+static const char *get_key_attribute(struct udev *udev, char *str)
 {
         char *pos;
         char *attr;
@@ -1053,8 +1052,8 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
         case TK_A_DB_PERSIST:
                 break;
         case TK_A_RUN_BUILTIN:
-                token->key.builtin_cmd = *(enum udev_builtin_cmd *)data;
         case TK_A_RUN_PROGRAM:
+                token->key.builtin_cmd = *(enum udev_builtin_cmd *)data;
                 token->key.value_off = add_string(rule_tmp->rules, value);
                 break;
         case TK_A_INOTIFY_WATCH:
@@ -1178,7 +1177,7 @@ static int add_rule(struct udev_rules *rules, char *line,
                     const char *filename, unsigned int filename_off, unsigned int lineno)
 {
         char *linepos;
-        char *attr;
+        const char *attr;
         struct rule_tmp rule_tmp;
 
         memset(&rule_tmp, 0x00, sizeof(struct rule_tmp));
@@ -1450,9 +1449,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                         } else if (strcmp(attr, "program") == 0) {
                                 enum udev_builtin_cmd cmd = UDEV_BUILTIN_MAX;
 
-                                if (strncmp(value, "socket:", 7) == 0)
-                                        log_error("RUN+=\"socket:...\" support will be removed from a future udev release. "
-                                            "Please remove it from: %s:%u and use libudev to subscribe to events.\n", filename, lineno);
                                 rule_add_key(&rule_tmp, TK_A_RUN_PROGRAM, op, value, &cmd);
                         } else {
                                 log_error("RUN{} unknown type, ignoring RUN %s:%u\n", filename, lineno);