route: add rtnl_netem_set_delay_distribution_data() to linker script

And some style fixes.

diff --git a/lib/route/qdisc/netem.c b/lib/route/qdisc/netem.c
index 0df5b0178fd2d9452aacea85854e5c973d1ba25b..18473e9d867f2e24477be5bc8e7a6a6e40889d6a 100644 (file)
--- a/lib/route/qdisc/netem.c
+++ b/lib/route/qdisc/netem.c
@@ -904,6 +904,8 @@ int rtnl_netem_set_delay_distribution(struct rtnl_qdisc *qdisc, const char *dist
        char *line;
        char name[NAME_MAX];
        char dist_suffix[] = ".dist";
+       int16_t *data;
+       char *test_suffix;
 
        /* Check several locations for the dist file */
        char *test_path[] = {
@@ -915,7 +917,7 @@ int rtnl_netem_set_delay_distribution(struct rtnl_qdisc *qdisc, const char *dist
        };
 
        /* If the given filename already ends in .dist, don't append it later */
-       char *test_suffix = strstr(dist_type, dist_suffix);
+       test_suffix = strstr(dist_type, dist_suffix);
        if (test_suffix != NULL && strlen(test_suffix) == 5)
                strcpy(dist_suffix, "");
 
@@ -928,7 +930,7 @@ int rtnl_netem_set_delay_distribution(struct rtnl_qdisc *qdisc, const char *dist
        if (f == NULL)
                return -nl_syserr2nlerr(errno);
 
-       int16_t * data = (int16_t *) calloc (MAXDIST, sizeof(int16_t));
+       data = (int16_t *) calloc (MAXDIST, sizeof(int16_t));
 
        line = (char *) calloc (sizeof(char), len + 1);
 
@@ -953,7 +955,7 @@ int rtnl_netem_set_delay_distribution(struct rtnl_qdisc *qdisc, const char *dist
 
        free(line);
        fclose(f);
-       
+
        return rtnl_netem_set_delay_distribution_data(qdisc, data, n);
 }
 

diff --git a/libnl-route-3.sym b/libnl-route-3.sym
index e66682ada27bf357ff8ed2c2c1d2c74df93a3851..3cee1138aca3253d42d53696596fe3b6c59096b6 100644 (file)
--- a/libnl-route-3.sym
+++ b/libnl-route-3.sym
@@ -1061,3 +1061,8 @@ global:
        rtnl_route_get_ttl_propagate;
        rtnl_route_nh_encap_mpls;
 } libnl_3_2_29;
+
+libnl_3_5 {
+global:
+       rtnl_netem_set_delay_distribution_data;
+} libnl_3_4;