chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused variable and two function stubs
[elogind.git]
/
src
/
core
/
loopback-setup.c
diff --git
a/src/core/loopback-setup.c
b/src/core/loopback-setup.c
index 9058b6f1c12ae2a2465cf08fde5a59b160f383c4..8a5b8121bc2404f1ca210aa4f1fd2831449153bb 100644
(file)
--- a/
src/core/loopback-setup.c
+++ b/
src/core/loopback-setup.c
@@
-24,7
+24,6
@@
#include <net/if.h>
#include <asm/types.h>
#include <netinet/in.h>
#include <net/if.h>
#include <asm/types.h>
#include <netinet/in.h>
-#include <linux/rtnetlink.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
@@
-48,10
+47,10
@@
static int pipe_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
}
static int add_addresses(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_address, int *counter) {
}
static int add_addresses(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_address, int *counter) {
- _cleanup_
sd_
rtnl_message_unref_ sd_rtnl_message *ipv4 = NULL, *ipv6 = NULL;
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *ipv4 = NULL, *ipv6 = NULL;
int r;
int r;
- r = sd_rtnl_message_
addr_new
(RTM_NEWADDR, if_loopback, AF_INET, &ipv4);
+ r = sd_rtnl_message_
new_addr
(RTM_NEWADDR, if_loopback, AF_INET, &ipv4);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-80,7
+79,7
@@
static int add_addresses(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_ad
if (!socket_ipv6_is_supported())
return 0;
if (!socket_ipv6_is_supported())
return 0;
- r = sd_rtnl_message_
addr_new
(RTM_NEWADDR, if_loopback, AF_INET6, &ipv6);
+ r = sd_rtnl_message_
new_addr
(RTM_NEWADDR, if_loopback, AF_INET6, &ipv6);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-110,10
+109,10
@@
static int add_addresses(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_ad
}
static int start_interface(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_address, int *counter) {
}
static int start_interface(sd_rtnl *rtnl, int if_loopback, struct in_addr *ipv4_address, int *counter) {
- _cleanup_
sd_
rtnl_message_unref_ sd_rtnl_message *req = NULL;
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
int r;
int r;
- r = sd_rtnl_message_
link_new
(RTM_SETLINK, if_loopback, &req);
+ r = sd_rtnl_message_
new_link
(RTM_SETLINK, if_loopback, &req);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-157,7
+156,7
@@
static int check_loopback(void) {
}
int loopback_setup(void) {
}
int loopback_setup(void) {
- _cleanup_
sd_
rtnl_unref_ sd_rtnl *rtnl = NULL;
+ _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;
int r, if_loopback, counter = 0;
bool eperm = false;
struct in_addr ipv4_address;
int r, if_loopback, counter = 0;
bool eperm = false;
struct in_addr ipv4_address;