chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-network: expose both admin and operational state directly
[elogind.git]
/
src
/
udev
/
udev-ctrl.c
diff --git
a/src/udev/udev-ctrl.c
b/src/udev/udev-ctrl.c
index a65603b3cf3b355293300afb128b3f36e01bc437..74bbd3a99eade7b908ed3524125a7f3efee7124a 100644
(file)
--- a/
src/udev/udev-ctrl.c
+++ b/
src/udev/udev-ctrl.c
@@
-75,7
+75,7
@@
struct udev_ctrl *udev_ctrl_new_from_fd(struct udev *udev, int fd)
struct udev_ctrl *uctrl;
const int on = 1;
struct udev_ctrl *uctrl;
const int on = 1;
- uctrl =
calloc(1, sizeof(struct udev_ctrl)
);
+ uctrl =
new0(struct udev_ctrl, 1
);
if (uctrl == NULL)
return NULL;
uctrl->refcount = 1;
if (uctrl == NULL)
return NULL;
uctrl->refcount = 1;
@@
-180,7
+180,7
@@
int udev_ctrl_get_fd(struct udev_ctrl *uctrl)
struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl)
{
struct udev_ctrl_connection *conn;
struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl)
{
struct udev_ctrl_connection *conn;
- struct ucred ucred;
+ struct ucred ucred
= {}
;
const int on = 1;
int r;
const int on = 1;
int r;
@@
-275,7
+275,7
@@
static int ctrl_send(struct udev_ctrl *uctrl, enum udev_ctrl_msg_type type, int
pfd[0].fd = uctrl->sock;
pfd[0].events = POLLIN;
pfd[0].fd = uctrl->sock;
pfd[0].events = POLLIN;
- r = poll(pfd, 1, timeout *
1000
);
+ r = poll(pfd, 1, timeout *
MSEC_PER_SEC
);
if (r < 0) {
if (errno == EINTR)
continue;
if (r < 0) {
if (errno == EINTR)
continue;