chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix write-only use of a few variables
[elogind.git]
/
src
/
udev
/
udev-watch.c
diff --git
a/src/udev/udev-watch.c
b/src/udev/udev-watch.c
index 04609a776fcf9f16fc398994c12d58a6ab5c3469..9b694c66667e03e560aa4e6a1e1d937c2f5973f3 100644
(file)
--- a/
src/udev/udev-watch.c
+++ b/
src/udev/udev-watch.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2004-2012 Kay Sievers <kay
.sievers
@vrfy.org>
+ * Copyright (C) 2004-2012 Kay Sievers <kay@vrfy.org>
* Copyright (C) 2009 Canonical Ltd.
* Copyright (C) 2009 Scott James Remnant <scott@netsplit.com>
*
* Copyright (C) 2009 Canonical Ltd.
* Copyright (C) 2009 Scott James Remnant <scott@netsplit.com>
*
@@
-75,7
+75,7
@@
void udev_watch_restore(struct udev *udev)
goto unlink;
device[len] = '\0';
goto unlink;
device[len] = '\0';
- dev = udev_device_new_from_
id_filename
(udev, device);
+ dev = udev_device_new_from_
device_id
(udev, device);
if (dev == NULL)
goto unlink;
if (dev == NULL)
goto unlink;
@@
-98,6
+98,7
@@
void udev_watch_begin(struct udev *udev, struct udev_device *dev)
{
char filename[UTIL_PATH_SIZE];
int wd;
{
char filename[UTIL_PATH_SIZE];
int wd;
+ int r;
if (inotify_fd < 0)
return;
if (inotify_fd < 0)
return;
@@
-111,9
+112,11
@@
void udev_watch_begin(struct udev *udev, struct udev_device *dev)
}
snprintf(filename, sizeof(filename), "/run/udev/watch/%d", wd);
}
snprintf(filename, sizeof(filename), "/run/udev/watch/%d", wd);
- mkdir_parents
_label
(filename, 0755);
+ mkdir_parents(filename, 0755);
unlink(filename);
unlink(filename);
- symlink(udev_device_get_id_filename(dev), filename);
+ r = symlink(udev_device_get_id_filename(dev), filename);
+ if (r < 0)
+ log_error("Failed to create symlink %s: %m", filename);
udev_device_set_watch_handle(dev, wd);
}
udev_device_set_watch_handle(dev, wd);
}
@@
-154,5
+157,5
@@
struct udev_device *udev_watch_lookup(struct udev *udev, int wd)
return NULL;
device[len] = '\0';
return NULL;
device[len] = '\0';
- return udev_device_new_from_
id_filename
(udev, device);
+ return udev_device_new_from_
device_id
(udev, device);
}
}