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: place opening { at the same line as the function declaration
[elogind.git]
/
src
/
udev
/
udev-watch.c
diff --git
a/src/udev/udev-watch.c
b/src/udev/udev-watch.c
index cbe0c37a4fe8c79309848618e7cf816232bbbb3b..061bd05875ab9a701e936146408f8a728f643db9 100644
(file)
--- a/
src/udev/udev-watch.c
+++ b/
src/udev/udev-watch.c
@@
-36,8
+36,7
@@
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)
log_error("inotify_init failed: %m");
inotify_fd = inotify_init1(IN_CLOEXEC);
if (inotify_fd < 0)
log_error("inotify_init failed: %m");
@@
-47,8
+46,7
@@
int udev_watch_init(struct udev *udev)
/* move any old watches directory out of the way, and then restore
* the watches
*/
/* 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;
@@
-94,8
+92,7
@@
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;
int r;
char filename[UTIL_PATH_SIZE];
int wd;
int r;
@@
-121,8
+118,7
@@
void udev_watch_begin(struct udev *udev, struct udev_device *dev)
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];
@@
-142,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;