Skip to content

Commit 5288827

Browse files
yuwatayuwata
committed
sd-netlink: minor coding style fixes
1 parent 61dcd98 commit 5288827

File tree

3 files changed

+35
-30
lines changed

3 files changed

+35
-30
lines changed

‎src/libsystemd/sd-netlink/netlink-message.c‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ int sd_netlink_message_read(sd_netlink_message *m, unsigned short type, size_t s
751751
}
752752

753753
int sd_netlink_message_read_data(sd_netlink_message *m, unsigned short type, size_t *ret_size, void **ret_data) {
754-
void *attr_data, *data;
754+
void *attr_data;
755755
int r;
756756

757757
assert_return(m, -EINVAL);
@@ -761,6 +761,8 @@ int sd_netlink_message_read_data(sd_netlink_message *m, unsigned short type, siz
761761
return r;
762762

763763
if (ret_data) {
764+
void *data;
765+
764766
data = memdup(attr_data, r);
765767
if (!data)
766768
return -ENOMEM;
@@ -776,7 +778,6 @@ int sd_netlink_message_read_data(sd_netlink_message *m, unsigned short type, siz
776778

777779
int sd_netlink_message_read_string_strdup(sd_netlink_message *m, unsigned short type, char **data) {
778780
void *attr_data;
779-
char *str;
780781
int r;
781782

782783
assert_return(m, -EINVAL);
@@ -790,6 +791,8 @@ int sd_netlink_message_read_string_strdup(sd_netlink_message *m, unsigned short
790791
return r;
791792

792793
if (data) {
794+
char *str;
795+
793796
str = strndup(attr_data, r);
794797
if (!str)
795798
return -ENOMEM;
@@ -801,8 +804,8 @@ int sd_netlink_message_read_string_strdup(sd_netlink_message *m, unsigned short
801804
}
802805

803806
int sd_netlink_message_read_string(sd_netlink_message *m, unsigned short type, const char **data) {
804-
int r;
805807
void *attr_data;
808+
int r;
806809

807810
assert_return(m, -EINVAL);
808811

@@ -813,7 +816,8 @@ int sd_netlink_message_read_string(sd_netlink_message *m, unsigned short type, c
813816
r = netlink_message_read_internal(m, type, &attr_data, NULL);
814817
if (r < 0)
815818
return r;
816-
else if (strnlen(attr_data, r) >= (size_t) r)
819+
820+
if (strnlen(attr_data, r) >= (size_t) r)
817821
return -EIO;
818822

819823
if (data)
@@ -823,8 +827,8 @@ int sd_netlink_message_read_string(sd_netlink_message *m, unsigned short type, c
823827
}
824828

825829
int sd_netlink_message_read_u8(sd_netlink_message *m, unsigned short type, uint8_t *data) {
826-
int r;
827830
void *attr_data;
831+
int r;
828832

829833
assert_return(m, -EINVAL);
830834

@@ -835,7 +839,8 @@ int sd_netlink_message_read_u8(sd_netlink_message *m, unsigned short type, uint8
835839
r = netlink_message_read_internal(m, type, &attr_data, NULL);
836840
if (r < 0)
837841
return r;
838-
else if ((size_t) r < sizeof(uint8_t))
842+
843+
if ((size_t) r < sizeof(uint8_t))
839844
return -EIO;
840845

841846
if (data)
@@ -858,7 +863,8 @@ int sd_netlink_message_read_u16(sd_netlink_message *m, unsigned short type, uint
858863
r = netlink_message_read_internal(m, type, &attr_data, &net_byteorder);
859864
if (r < 0)
860865
return r;
861-
else if ((size_t) r < sizeof(uint16_t))
866+
867+
if ((size_t) r < sizeof(uint16_t))
862868
return -EIO;
863869

864870
if (data) {
@@ -885,7 +891,8 @@ int sd_netlink_message_read_u32(sd_netlink_message *m, unsigned short type, uint
885891
r = netlink_message_read_internal(m, type, &attr_data, &net_byteorder);
886892
if (r < 0)
887893
return r;
888-
else if ((size_t) r < sizeof(uint32_t))
894+
895+
if ((size_t) r < sizeof(uint32_t))
889896
return -EIO;
890897

891898
if (data) {
@@ -899,8 +906,8 @@ int sd_netlink_message_read_u32(sd_netlink_message *m, unsigned short type, uint
899906
}
900907

901908
int sd_netlink_message_read_ether_addr(sd_netlink_message *m, unsigned short type, struct ether_addr *data) {
902-
int r;
903909
void *attr_data;
910+
int r;
904911

905912
assert_return(m, -EINVAL);
906913

@@ -911,7 +918,8 @@ int sd_netlink_message_read_ether_addr(sd_netlink_message *m, unsigned short typ
911918
r = netlink_message_read_internal(m, type, &attr_data, NULL);
912919
if (r < 0)
913920
return r;
914-
else if ((size_t) r < sizeof(struct ether_addr))
921+
922+
if ((size_t) r < sizeof(struct ether_addr))
915923
return -EIO;
916924

917925
if (data)
@@ -921,8 +929,8 @@ int sd_netlink_message_read_ether_addr(sd_netlink_message *m, unsigned short typ
921929
}
922930

923931
int netlink_message_read_hw_addr(sd_netlink_message *m, unsigned short type, struct hw_addr_data *data) {
924-
int r;
925932
void *attr_data;
933+
int r;
926934

927935
assert_return(m, -EINVAL);
928936

@@ -933,7 +941,8 @@ int netlink_message_read_hw_addr(sd_netlink_message *m, unsigned short type, str
933941
r = netlink_message_read_internal(m, type, &attr_data, NULL);
934942
if (r < 0)
935943
return r;
936-
else if (r > HW_ADDR_MAX_SIZE)
944+
945+
if (r > HW_ADDR_MAX_SIZE)
937946
return -EIO;
938947

939948
if (data) {
@@ -945,8 +954,8 @@ int netlink_message_read_hw_addr(sd_netlink_message *m, unsigned short type, str
945954
}
946955

947956
int sd_netlink_message_read_cache_info(sd_netlink_message *m, unsigned short type, struct ifa_cacheinfo *info) {
948-
int r;
949957
void *attr_data;
958+
int r;
950959

951960
assert_return(m, -EINVAL);
952961

@@ -957,7 +966,8 @@ int sd_netlink_message_read_cache_info(sd_netlink_message *m, unsigned short typ
957966
r = netlink_message_read_internal(m, type, &attr_data, NULL);
958967
if (r < 0)
959968
return r;
960-
else if ((size_t) r < sizeof(struct ifa_cacheinfo))
969+
970+
if ((size_t) r < sizeof(struct ifa_cacheinfo))
961971
return -EIO;
962972

963973
if (info)
@@ -980,7 +990,8 @@ int netlink_message_read_in_addr_union(sd_netlink_message *m, unsigned short typ
980990
r = netlink_message_read_internal(m, type, &attr_data, NULL);
981991
if (r < 0)
982992
return r;
983-
else if ((size_t) r < FAMILY_ADDRESS_SIZE(family))
993+
994+
if ((size_t) r < FAMILY_ADDRESS_SIZE(family))
984995
return -EIO;
985996

986997
if (data)

‎src/libsystemd/sd-netlink/netlink-socket.c‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,11 @@ int socket_bind(sd_netlink *nl) {
8181

8282
addrlen = sizeof(nl->sockaddr);
8383

84-
r = bind(nl->fd, &nl->sockaddr.sa, addrlen);
8584
/* ignore EINVAL to allow binding an already bound socket */
86-
if (r < 0 && errno != EINVAL)
85+
if (bind(nl->fd, &nl->sockaddr.sa, addrlen) < 0 && errno != EINVAL)
8786
return -errno;
8887

89-
r = getsockname(nl->fd, &nl->sockaddr.sa, &addrlen);
90-
if (r < 0)
88+
if (getsockname(nl->fd, &nl->sockaddr.sa, &addrlen) < 0)
9189
return -errno;
9290

9391
return broadcast_groups_get(nl);
@@ -328,7 +326,7 @@ int socket_read_message(sd_netlink *nl) {
328326
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
329327
size_t size;
330328

331-
if (!group && new_msg->nlmsg_pid != nl->sockaddr.nl.nl_pid)
329+
if (group == 0 && new_msg->nlmsg_pid != nl->sockaddr.nl.nl_pid)
332330
/* not broadcast and not for us */
333331
continue;
334332

@@ -365,7 +363,7 @@ int socket_read_message(sd_netlink *nl) {
365363
if (r < 0)
366364
return r;
367365

368-
m->broadcast = !!group;
366+
m->broadcast = group != 0;
369367

370368
m->hdr = memdup(new_msg, new_msg->nlmsg_len);
371369
if (!m->hdr)

‎src/libsystemd/sd-netlink/sd-netlink.c‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ int sd_netlink_new_from_fd(sd_netlink **ret, int fd) {
8181

8282
addrlen = sizeof(nl->sockaddr);
8383

84-
r = getsockname(fd, &nl->sockaddr.sa, &addrlen);
85-
if (r < 0)
84+
if (getsockname(fd, &nl->sockaddr.sa, &addrlen) < 0)
8685
return -errno;
8786

8887
if (nl->sockaddr.nl.nl_family != AF_NETLINK)
@@ -483,15 +482,12 @@ static int process_running(sd_netlink *nl, sd_netlink_message **ret) {
483482
if (!m)
484483
goto null_message;
485484

486-
if (sd_netlink_message_is_broadcast(m)) {
485+
if (sd_netlink_message_is_broadcast(m))
487486
r = process_match(nl, m);
488-
if (r != 0)
489-
goto null_message;
490-
} else {
487+
else
491488
r = process_reply(nl, m);
492-
if (r != 0)
493-
goto null_message;
494-
}
489+
if (r != 0)
490+
goto null_message;
495491

496492
if (ret) {
497493
*ret = TAKE_PTR(m);

0 commit comments

Comments
 (0)