chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: link-config - whitespace
[elogind.git]
/
src
/
udev
/
udev-watch.c
diff --git
a/src/udev/udev-watch.c
b/src/udev/udev-watch.c
index 1091ec8d69765cbf4f5c6606d3d5e7bbbc232ac7..061bd05875ab9a701e936146408f8a728f643db9 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>
*
@@
-36,19
+36,17
@@
static int inotify_fd = -1;
* set to cloexec since we need our children to be able to add
* watches for us
*/
* set to cloexec since we need our children to be able to add
* watches for us
*/
-int udev_watch_init(struct udev *udev)
-{
+int udev_watch_init(struct udev *udev) {
inotify_fd = inotify_init1(IN_CLOEXEC);
if (inotify_fd < 0)
inotify_fd = inotify_init1(IN_CLOEXEC);
if (inotify_fd < 0)
- log_error("inotify_init failed: %m
\n
");
+ log_error("inotify_init failed: %m");
return inotify_fd;
}
/* move any old watches directory out of the way, and then restore
* the watches
*/
return inotify_fd;
}
/* move any old watches directory out of the way, and then restore
* the watches
*/
-void udev_watch_restore(struct udev *udev)
-{
+void udev_watch_restore(struct udev *udev) {
if (inotify_fd < 0)
return;
if (inotify_fd < 0)
return;
@@
-75,11
+73,11
@@
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;
- log_debug("restoring old watch on '%s'
\n
", udev_device_get_devnode(dev));
+ log_debug("restoring old watch on '%s'", udev_device_get_devnode(dev));
udev_watch_begin(udev, dev);
udev_device_unref(dev);
unlink:
udev_watch_begin(udev, dev);
udev_device_unref(dev);
unlink:
@@
-94,18
+92,18
@@
unlink:
}
}
}
}
-void udev_watch_begin(struct udev *udev, struct udev_device *dev)
-{
+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;
- log_debug("adding watch on '%s'
\n
", udev_device_get_devnode(dev));
+ log_debug("adding watch on '%s'", udev_device_get_devnode(dev));
wd = inotify_add_watch(inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE);
if (wd < 0) {
wd = inotify_add_watch(inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE);
if (wd < 0) {
- log_error("inotify_add_watch(%d, %s, %o) failed: %m
\n
",
+ log_error("inotify_add_watch(%d, %s, %o) failed: %m",
inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE);
return;
}
inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE);
return;
}
@@
-113,13
+111,14
@@
void udev_watch_begin(struct udev *udev, struct udev_device *dev)
snprintf(filename, sizeof(filename), "/run/udev/watch/%d", wd);
mkdir_parents(filename, 0755);
unlink(filename);
snprintf(filename, sizeof(filename), "/run/udev/watch/%d", wd);
mkdir_parents(filename, 0755);
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);
}
-void udev_watch_end(struct udev *udev, struct udev_device *dev)
-{
+void udev_watch_end(struct udev *udev, struct udev_device *dev) {
int wd;
char filename[UTIL_PATH_SIZE];
int wd;
char filename[UTIL_PATH_SIZE];
@@
-130,7
+129,7
@@
void udev_watch_end(struct udev *udev, struct udev_device *dev)
if (wd < 0)
return;
if (wd < 0)
return;
- log_debug("removing watch on '%s'
\n
", udev_device_get_devnode(dev));
+ log_debug("removing watch on '%s'", udev_device_get_devnode(dev));
inotify_rm_watch(inotify_fd, wd);
snprintf(filename, sizeof(filename), "/run/udev/watch/%d", wd);
inotify_rm_watch(inotify_fd, wd);
snprintf(filename, sizeof(filename), "/run/udev/watch/%d", wd);
@@
-139,8
+138,7
@@
void udev_watch_end(struct udev *udev, struct udev_device *dev)
udev_device_set_watch_handle(dev, -1);
}
udev_device_set_watch_handle(dev, -1);
}
-struct udev_device *udev_watch_lookup(struct udev *udev, int wd)
-{
+struct udev_device *udev_watch_lookup(struct udev *udev, int wd) {
char filename[UTIL_PATH_SIZE];
char device[UTIL_NAME_SIZE];
ssize_t len;
char filename[UTIL_PATH_SIZE];
char device[UTIL_NAME_SIZE];
ssize_t len;
@@
-154,5
+152,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);
}
}