chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
selinux: clean up selinux label function naming
[elogind.git]
/
src
/
udev
/
udevadm-monitor.c
diff --git
a/src/udev/udevadm-monitor.c
b/src/udev/udevadm-monitor.c
index 94e76da6fd2c0a6073bb27f1df40053f25f4e633..e776fb99dcfb14bc061fad69e4e1757bbf32d96d 100644
(file)
--- a/
src/udev/udevadm-monitor.c
+++ b/
src/udev/udevadm-monitor.c
@@
-37,20
+37,18
@@
static bool udev_exit;
static bool udev_exit;
-static void sig_handler(int signum)
-{
+static void sig_handler(int signum) {
if (signum == SIGINT || signum == SIGTERM)
udev_exit = true;
}
if (signum == SIGINT || signum == SIGTERM)
udev_exit = true;
}
-static void print_device(struct udev_device *device, const char *source, int prop)
-{
+static void print_device(struct udev_device *device, const char *source, int prop) {
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
- printf("%-6s[%
llu.%06u
] %-8s %s (%s)\n",
+ printf("%-6s[%
"PRI_TIME".%06ld
] %-8s %s (%s)\n",
source,
source,
-
(unsigned long long) ts.tv_sec, (unsigned int)
ts.tv_nsec/1000,
+
ts.tv_sec,
ts.tv_nsec/1000,
udev_device_get_action(device),
udev_device_get_devpath(device),
udev_device_get_subsystem(device));
udev_device_get_action(device),
udev_device_get_devpath(device),
udev_device_get_subsystem(device));
@@
-75,8
+73,7
@@
static void help(void) {
" -h,--help\n\n");
}
" -h,--help\n\n");
}
-static int adm_monitor(struct udev *udev, int argc, char *argv[])
-{
+static int adm_monitor(struct udev *udev, int argc, char *argv[]) {
struct sigaction act = {};
sigset_t mask;
bool prop = false;
struct sigaction act = {};
sigset_t mask;
bool prop = false;
@@
-158,7
+155,7
@@
static int adm_monitor(struct udev *udev, int argc, char *argv[])
fd_ep = epoll_create1(EPOLL_CLOEXEC);
if (fd_ep < 0) {
fd_ep = epoll_create1(EPOLL_CLOEXEC);
if (fd_ep < 0) {
- log_error("error creating epoll fd: %m
\n
");
+ log_error("error creating epoll fd: %m");
return 1;
}
return 1;
}
@@
-194,11
+191,11
@@
static int adm_monitor(struct udev *udev, int argc, char *argv[])
return 2;
}
return 2;
}
- mem
set(&ep_udev, 0
, sizeof(struct epoll_event));
+ mem
zero(&ep_udev
, sizeof(struct epoll_event));
ep_udev.events = EPOLLIN;
ep_udev.data.fd = fd_udev;
if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_udev, &ep_udev) < 0) {
ep_udev.events = EPOLLIN;
ep_udev.data.fd = fd_udev;
if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_udev, &ep_udev) < 0) {
- log_error("fail to add fd to epoll: %m
\n
");
+ log_error("fail to add fd to epoll: %m");
return 2;
}
return 2;
}
@@
-228,11
+225,11
@@
static int adm_monitor(struct udev *udev, int argc, char *argv[])
return 4;
}
return 4;
}
- mem
set(&ep_kernel, 0
, sizeof(struct epoll_event));
+ mem
zero(&ep_kernel
, sizeof(struct epoll_event));
ep_kernel.events = EPOLLIN;
ep_kernel.data.fd = fd_kernel;
if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_kernel, &ep_kernel) < 0) {
ep_kernel.events = EPOLLIN;
ep_kernel.data.fd = fd_kernel;
if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_kernel, &ep_kernel) < 0) {
- log_error("fail to add fd to epoll: %m
\n
");
+ log_error("fail to add fd to epoll: %m");
return 5;
}
return 5;
}