plaisthos has uploaded this change for review. ( http://gerrit.openvpn.net/c/openvpn/+/1944?usp=email )
Change subject: Inline ret definition in dco_linux.c ...................................................................... Inline ret definition in dco_linux.c These are never read and then directly overwritten by the return value of the send function. Inline these to make the code a bit cleaner. Found by cppcheck. Change-Id: I98f33343d35453219e43b8730cc10bcef119ea20 Signed-off-by: Arne Schwabe <[email protected]> --- M src/openvpn/dco_linux.c 1 file changed, 9 insertions(+), 17 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/44/1944/1 diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index 56f6259..8f5f26a 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -235,7 +235,6 @@ struct nl_msg *nl_msg = ovpn_dco_nlmsg_create(dco, OVPN_CMD_PEER_NEW); struct nlattr *attr = nla_nest_start(nl_msg, OVPN_A_PEER); - int ret = -EMSGSIZE; NLA_PUT_U32(nl_msg, OVPN_A_PEER_ID, peerid); NLA_PUT_U32(nl_msg, OVPN_A_PEER_SOCKET, sd); @@ -289,7 +288,7 @@ } nla_nest_end(nl_msg, attr); - ret = ovpn_nl_msg_send(dco, nl_msg, __func__); + int ret = ovpn_nl_msg_send(dco, nl_msg, __func__); nla_put_failure: nlmsg_free(nl_msg); @@ -545,11 +544,10 @@ } struct nlattr *attr = nla_nest_start(nl_msg, OVPN_A_KEYCONF); - int ret = -EMSGSIZE; NLA_PUT_U32(nl_msg, OVPN_A_KEYCONF_PEER_ID, peerid); nla_nest_end(nl_msg, attr); - ret = ovpn_nl_msg_send(dco, nl_msg, __func__); + int ret = ovpn_nl_msg_send(dco, nl_msg, __func__); nla_put_failure: nlmsg_free(nl_msg); @@ -569,11 +567,11 @@ } struct nlattr *attr = nla_nest_start(nl_msg, OVPN_A_PEER); - int ret = -EMSGSIZE; + NLA_PUT_U32(nl_msg, OVPN_A_PEER_ID, peerid); nla_nest_end(nl_msg, attr); - ret = ovpn_nl_msg_send(dco, nl_msg, __func__); + int ret = ovpn_nl_msg_send(dco, nl_msg, __func__); nla_put_failure: nlmsg_free(nl_msg); @@ -584,7 +582,6 @@ int dco_del_key(dco_context_t *dco, unsigned int peerid, dco_key_slot_t slot) { - int ret = -EMSGSIZE; msg(D_DCO_DEBUG, "%s: peer-id %d, slot %d", __func__, peerid, slot); struct nl_msg *nl_msg = ovpn_dco_nlmsg_create(dco, OVPN_CMD_KEY_DEL); @@ -598,7 +595,7 @@ NLA_PUT_U32(nl_msg, OVPN_A_KEYCONF_SLOT, slot); nla_nest_end(nl_msg, keyconf); - ret = ovpn_nl_msg_send(dco, nl_msg, __func__); + int ret = ovpn_nl_msg_send(dco, nl_msg, __func__); nla_put_failure: nlmsg_free(nl_msg); @@ -625,8 +622,6 @@ dco_cipher_t dco_cipher = dco_get_cipher(ciphername); - int ret = -EMSGSIZE; - struct nlattr *key_conf = nla_nest_start(nl_msg, OVPN_A_KEYCONF); NLA_PUT_U32(nl_msg, OVPN_A_KEYCONF_PEER_ID, peerid); NLA_PUT_U32(nl_msg, OVPN_A_KEYCONF_SLOT, slot); @@ -652,7 +647,7 @@ nla_nest_end(nl_msg, key_conf); - ret = ovpn_nl_msg_send(dco, nl_msg, __func__); + int ret = ovpn_nl_msg_send(dco, nl_msg, __func__); nla_put_failure: nlmsg_free(nl_msg); @@ -673,13 +668,12 @@ } struct nlattr *attr = nla_nest_start(nl_msg, OVPN_A_PEER); - int ret = -EMSGSIZE; NLA_PUT_U32(nl_msg, OVPN_A_PEER_ID, peerid); NLA_PUT_U32(nl_msg, OVPN_A_PEER_KEEPALIVE_INTERVAL, keepalive_interval); NLA_PUT_U32(nl_msg, OVPN_A_PEER_KEEPALIVE_TIMEOUT, keepalive_timeout); nla_nest_end(nl_msg, attr); - ret = ovpn_nl_msg_send(dco, nl_msg, __func__); + int ret = ovpn_nl_msg_send(dco, nl_msg, __func__); nla_put_failure: nlmsg_free(nl_msg); @@ -754,10 +748,9 @@ genlmsg_put(nl_msg, 0, 0, dco->ctrlid, 0, 0, CTRL_CMD_GETFAMILY, 0); - int ret = -EMSGSIZE; NLA_PUT_STRING(nl_msg, CTRL_ATTR_FAMILY_NAME, OVPN_FAMILY_NAME); - ret = ovpn_nl_msg_send(dco, nl_msg, __func__); + int ret = ovpn_nl_msg_send(dco, nl_msg, __func__); nla_put_failure: nlmsg_free(nl_msg); @@ -1192,7 +1185,6 @@ struct nl_msg *nl_msg = ovpn_dco_nlmsg_create(dco, OVPN_CMD_PEER_GET); struct nlattr *attr = nla_nest_start(nl_msg, OVPN_A_PEER); - int ret = -EMSGSIZE; if (peer_id != -1) { @@ -1204,7 +1196,7 @@ } nla_nest_end(nl_msg, attr); - ret = ovpn_nl_msg_send(dco, nl_msg, __func__); + int ret = ovpn_nl_msg_send(dco, nl_msg, __func__); nla_put_failure: nlmsg_free(nl_msg); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1944?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I98f33343d35453219e43b8730cc10bcef119ea20 Gerrit-Change-Number: 1944 Gerrit-PatchSet: 1 Gerrit-Owner: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
