[systemd-commits] src/libsystemd src/systemd

[Tom Gundersen]

 src/libsystemd/sd-rtnl/local-addresses.c |    4 ++--
 src/libsystemd/sd-rtnl/rtnl-message.c    |    4 ++--
 src/systemd/sd-rtnl.h                    |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 584d0d2aefe3ab521fcf3da818a14b4538ce04a9
Author: Tom Gundersen <teg at jklm.no>
Date:   Thu Dec 4 16:14:06 2014 +0100

    sd-rtnl: rename sd_rtnl_message_route_get_{dst,src}_len to *_prefixlen
    
    This makes the API more consistent.

diff --git a/src/libsystemd/sd-rtnl/local-addresses.c b/src/libsystemd/sd-rtnl/local-addresses.c
index e520cdf..31bfa06 100644
--- a/src/libsystemd/sd-rtnl/local-addresses.c
+++ b/src/libsystemd/sd-rtnl/local-addresses.c
@@ -212,13 +212,13 @@ int local_gateways(sd_rtnl *context, int ifindex, int af, struct local_address *
                         continue;
 
                 /* We only care for default routes */
-                r = sd_rtnl_message_route_get_dst_len(m, &dst_len);
+                r = sd_rtnl_message_route_get_dst_prefixlen(m, &dst_len);
                 if (r < 0)
                         return r;
                 if (dst_len != 0)
                         continue;
 
-                r = sd_rtnl_message_route_get_src_len(m, &src_len);
+                r = sd_rtnl_message_route_get_src_prefixlen(m, &src_len);
                 if (r < 0)
                         return r;
                 if (src_len != 0)
diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c
index 4491a00..1112aa6 100644
--- a/src/libsystemd/sd-rtnl/rtnl-message.c
+++ b/src/libsystemd/sd-rtnl/rtnl-message.c
@@ -161,7 +161,7 @@ int sd_rtnl_message_route_get_family(sd_rtnl_message *m, int *family) {
         return 0;
 }
 
-int sd_rtnl_message_route_get_dst_len(sd_rtnl_message *m, unsigned char *dst_len) {
+int sd_rtnl_message_route_get_dst_prefixlen(sd_rtnl_message *m, unsigned char *dst_len) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -176,7 +176,7 @@ int sd_rtnl_message_route_get_dst_len(sd_rtnl_message *m, unsigned char *dst_len
         return 0;
 }
 
-int sd_rtnl_message_route_get_src_len(sd_rtnl_message *m, unsigned char *src_len) {
+int sd_rtnl_message_route_get_src_prefixlen(sd_rtnl_message *m, unsigned char *src_len) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
diff --git a/src/systemd/sd-rtnl.h b/src/systemd/sd-rtnl.h
index 4754d29..6adcf32 100644
--- a/src/systemd/sd-rtnl.h
+++ b/src/systemd/sd-rtnl.h
@@ -105,8 +105,8 @@ int sd_rtnl_message_route_set_dst_prefixlen(sd_rtnl_message *m, unsigned char pr
 int sd_rtnl_message_route_set_src_prefixlen(sd_rtnl_message *m, unsigned char prefixlen);
 int sd_rtnl_message_route_set_scope(sd_rtnl_message *m, unsigned char scope);
 int sd_rtnl_message_route_get_family(sd_rtnl_message *m, int *family);
-int sd_rtnl_message_route_get_dst_len(sd_rtnl_message *m, unsigned char *dst_len);
-int sd_rtnl_message_route_get_src_len(sd_rtnl_message *m, unsigned char *src_len);
+int sd_rtnl_message_route_get_dst_prefixlen(sd_rtnl_message *m, unsigned char *dst_len);
+int sd_rtnl_message_route_get_src_prefixlenlen(sd_rtnl_message *m, unsigned char *src_len);
 
 int sd_rtnl_message_neigh_get_family(sd_rtnl_message *m, int *family);
 int sd_rtnl_message_neigh_get_ifindex(sd_rtnl_message *m, int *family);