X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudev-rules.c;h=f793e57712266429f3c1e7903c11d964daca34f0;hp=e2ba0b0cc88926b57b11a6e2de31c656bd564a58;hb=919ce0b7affc6fbd68598b709faf477f56c22ac1;hpb=75716dd8eafafbc8605e18d605a091696502a4d0

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index e2ba0b0cc..f793e5771 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -431,7 +431,7 @@ static void dump_rules(struct udev_rules *rules)
                   rules->token_cur * sizeof(struct token),
                   rules->buf_count,
                   rules->buf_cur);
-        for(i = 0; i < rules->token_cur; i++)
+        for (i = 0; i < rules->token_cur; i++)
                 dump_token(rules, &rules->tokens[i]);
 }
 #else
@@ -1704,6 +1704,9 @@ struct udev_rules *udev_rules_unref(struct udev_rules *rules)
 
 bool udev_rules_check_timestamp(struct udev_rules *rules)
 {
+        if (!rules)
+                return false;
+
         return paths_check_timestamp(rules->dirs, &rules->dirs_ts_usec, true);
 }
 
@@ -2592,7 +2595,7 @@ int udev_rules_apply_static_dev_perms(struct udev_rules *rules)
                                         strscpyl(tag_symlink, sizeof(tag_symlink), tags_dir, unescaped_filename, NULL);
                                         r = symlink(device_node, tag_symlink);
                                         if (r < 0 && errno != EEXIST) {
-                                                log_error("failed to create symlink %s -> %s: %s\n", tag_symlink, device_node, strerror(errno));
+                                                log_error("failed to create symlink %s -> %s: %m\n", tag_symlink, device_node);
                                                 return -errno;
                                         } else
                                                 r = 0;