udev-ctrl: fix coding style isuues
This commit is contained in:
parent
e9c026c2bf
commit
9315f853c4
|
@ -76,7 +76,7 @@ struct udev_ctrl *udev_ctrl_new_from_fd(int fd) {
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
uctrl = new0(struct udev_ctrl, 1);
|
uctrl = new0(struct udev_ctrl, 1);
|
||||||
if (uctrl == NULL)
|
if (!uctrl)
|
||||||
return NULL;
|
return NULL;
|
||||||
uctrl->n_ref = 1;
|
uctrl->n_ref = 1;
|
||||||
|
|
||||||
|
@ -147,7 +147,7 @@ DEFINE_PRIVATE_TRIVIAL_REF_FUNC(struct udev_ctrl, udev_ctrl);
|
||||||
DEFINE_TRIVIAL_UNREF_FUNC(struct udev_ctrl, udev_ctrl, udev_ctrl_free);
|
DEFINE_TRIVIAL_UNREF_FUNC(struct udev_ctrl, udev_ctrl, udev_ctrl_free);
|
||||||
|
|
||||||
int udev_ctrl_cleanup(struct udev_ctrl *uctrl) {
|
int udev_ctrl_cleanup(struct udev_ctrl *uctrl) {
|
||||||
if (uctrl == NULL)
|
if (!uctrl)
|
||||||
return 0;
|
return 0;
|
||||||
if (uctrl->cleanup_socket)
|
if (uctrl->cleanup_socket)
|
||||||
sockaddr_un_unlink(&uctrl->saddr.un);
|
sockaddr_un_unlink(&uctrl->saddr.un);
|
||||||
|
@ -155,7 +155,7 @@ int udev_ctrl_cleanup(struct udev_ctrl *uctrl) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int udev_ctrl_get_fd(struct udev_ctrl *uctrl) {
|
int udev_ctrl_get_fd(struct udev_ctrl *uctrl) {
|
||||||
if (uctrl == NULL)
|
if (!uctrl)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
return uctrl->sock;
|
return uctrl->sock;
|
||||||
}
|
}
|
||||||
|
@ -166,7 +166,7 @@ struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl) {
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
conn = new(struct udev_ctrl_connection, 1);
|
conn = new(struct udev_ctrl_connection, 1);
|
||||||
if (conn == NULL)
|
if (!conn)
|
||||||
return NULL;
|
return NULL;
|
||||||
conn->n_ref = 1;
|
conn->n_ref = 1;
|
||||||
conn->uctrl = uctrl;
|
conn->uctrl = uctrl;
|
||||||
|
@ -220,7 +220,7 @@ static int ctrl_send(struct udev_ctrl *uctrl, enum udev_ctrl_msg_type type, int
|
||||||
ctrl_msg_wire.magic = UDEV_CTRL_MAGIC;
|
ctrl_msg_wire.magic = UDEV_CTRL_MAGIC;
|
||||||
ctrl_msg_wire.type = type;
|
ctrl_msg_wire.type = type;
|
||||||
|
|
||||||
if (buf != NULL)
|
if (buf)
|
||||||
strscpy(ctrl_msg_wire.buf, sizeof(ctrl_msg_wire.buf), buf);
|
strscpy(ctrl_msg_wire.buf, sizeof(ctrl_msg_wire.buf), buf);
|
||||||
else
|
else
|
||||||
ctrl_msg_wire.intval = intval;
|
ctrl_msg_wire.intval = intval;
|
||||||
|
@ -312,7 +312,7 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl_connection *conn) {
|
||||||
struct ucred *cred;
|
struct ucred *cred;
|
||||||
|
|
||||||
uctrl_msg = new0(struct udev_ctrl_msg, 1);
|
uctrl_msg = new0(struct udev_ctrl_msg, 1);
|
||||||
if (uctrl_msg == NULL)
|
if (!uctrl_msg)
|
||||||
return NULL;
|
return NULL;
|
||||||
uctrl_msg->n_ref = 1;
|
uctrl_msg->n_ref = 1;
|
||||||
uctrl_msg->conn = conn;
|
uctrl_msg->conn = conn;
|
||||||
|
@ -357,7 +357,7 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl_connection *conn) {
|
||||||
|
|
||||||
cmsg = CMSG_FIRSTHDR(&smsg);
|
cmsg = CMSG_FIRSTHDR(&smsg);
|
||||||
|
|
||||||
if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
|
if (!cmsg || cmsg->cmsg_type != SCM_CREDENTIALS) {
|
||||||
log_error("no sender credentials received, message ignored");
|
log_error("no sender credentials received, message ignored");
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue