chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
api: in constructor function calls, always put the returned object pointer first...
[elogind.git]
/
src
/
libsystemd
/
sd-rtnl
/
rtnl-util.c
diff --git
a/src/libsystemd/sd-rtnl/rtnl-util.c
b/src/libsystemd/sd-rtnl/rtnl-util.c
index 29250c90a72bc1ffb789a4c87afa63e1a19f03e9..fc834e95546fe4d4898f61fb41650773fce16f99 100644
(file)
--- a/
src/libsystemd/sd-rtnl/rtnl-util.c
+++ b/
src/libsystemd/sd-rtnl/rtnl-util.c
@@
-19,7
+19,6
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <linux/rtnetlink.h>
#include <netinet/ether.h>
#include "sd-rtnl.h"
#include <netinet/ether.h>
#include "sd-rtnl.h"
@@
-28,14
+27,14
@@
#include "rtnl-internal.h"
int rtnl_set_link_name(sd_rtnl *rtnl, int ifindex, const char *name) {
#include "rtnl-internal.h"
int rtnl_set_link_name(sd_rtnl *rtnl, int ifindex, const char *name) {
- _cleanup_
sd_
rtnl_message_unref_ sd_rtnl_message *message = NULL;
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *message = NULL;
int r;
assert(rtnl);
assert(ifindex > 0);
assert(name);
int r;
assert(rtnl);
assert(ifindex > 0);
assert(name);
- r = sd_rtnl_message_
link_new(RTM_SETLINK, ifindex, &message
);
+ r = sd_rtnl_message_
new_link(rtnl, &message, RTM_SETLINK, ifindex
);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-52,7
+51,7
@@
int rtnl_set_link_name(sd_rtnl *rtnl, int ifindex, const char *name) {
int rtnl_set_link_properties(sd_rtnl *rtnl, int ifindex, const char *alias,
const struct ether_addr *mac, unsigned mtu) {
int rtnl_set_link_properties(sd_rtnl *rtnl, int ifindex, const char *alias,
const struct ether_addr *mac, unsigned mtu) {
- _cleanup_
sd_
rtnl_message_unref_ sd_rtnl_message *message = NULL;
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *message = NULL;
bool need_update = false;
int r;
bool need_update = false;
int r;
@@
-62,7
+61,7
@@
int rtnl_set_link_properties(sd_rtnl *rtnl, int ifindex, const char *alias,
if (!alias && !mac && mtu == 0)
return 0;
if (!alias && !mac && mtu == 0)
return 0;
- r = sd_rtnl_message_
link_new(RTM_SETLINK, ifindex, &message
);
+ r = sd_rtnl_message_
new_link(rtnl, &message, RTM_SETLINK, ifindex
);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-106,7
+105,7
@@
int rtnl_message_new_synthetic_error(int error, uint32_t serial, sd_rtnl_message
assert(error <= 0);
assert(error <= 0);
- r = message_new(ret, NLMSG_SPACE(sizeof(struct nlmsgerr)));
+ r = message_new(
NULL,
ret, NLMSG_SPACE(sizeof(struct nlmsgerr)));
if (r < 0)
return r;
if (r < 0)
return r;