all: enable -Wmissing-prototype warning for all components

diff --git a/Makefile.am b/Makefile.am
index 76d51e18b1a50fe9bb9630ead65d5529b536cdd6..06dca96a84fd87e59e3de17ae889cc17a4561559 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,8 @@ pkgconfig_DATA = \
        libnl-idiag-3.0.pc
 
 warn_cppflags = \
-       -Wall
+       -Wall \
+       -Wmissing-prototypes
 
 ###############################################################################
 
@@ -287,7 +288,6 @@ EXTRA_DIST += \
 
 lib_cppflags = \
        $(warn_cppflags) \
-       -Wmissing-prototypes \
        -D_GNU_SOURCE \
        -DSYSCONFDIR=\"$(sysconfdir)/libnl\" \
        -I$(srcdir)/include/linux-private \

diff --git a/tests/check-addr.c b/tests/check-addr.c
index 39f3ede4d9183b1454ec388a11b99bf1ef51cdc8..48a2d93172d6992e0594ff68ae171ec4b7a490b5 100644 (file)
--- a/tests/check-addr.c
+++ b/tests/check-addr.c
@@ -12,6 +12,8 @@
 #include <check.h>
 #include <netlink/addr.h>
 
+#include "util.h"
+
 START_TEST(addr_alloc)
 {
        struct nl_addr *addr;

diff --git a/tests/check-all.c b/tests/check-all.c
index e43180246c65d725de102a7dfdf3078047dda749..042452ddf6c4c24df58139f925af9d523876be65 100644 (file)
--- a/tests/check-all.c
+++ b/tests/check-all.c
@@ -11,8 +11,7 @@
 
 #include <check.h>
 
-extern Suite *make_nl_addr_suite(void);
-extern Suite *make_nl_attr_suite(void);
+#include "util.h"
 
 static Suite *main_suite(void)
 {

diff --git a/tests/test-complex-HTB-with-hash-filters.c b/tests/test-complex-HTB-with-hash-filters.c
index 48cf5e326168f9185eb1f4e0017bed2ceffc1e8d..453f801634444034e022aea19d05b91380ed0150 100644 (file)
--- a/tests/test-complex-HTB-with-hash-filters.c
+++ b/tests/test-complex-HTB-with-hash-filters.c
@@ -29,7 +29,7 @@
 #define        TC_HANDLE(maj, min)   (TC_H_MAJ((maj) << 16) | TC_H_MIN(min))
 
 /* some functions are copied from iproute-tc tool */
-int get_u32(__u32 *val, const char *arg, int base)
+static int get_u32(__u32 *val, const char *arg, int base)
 {
        unsigned long res;
        char *ptr;
@@ -43,7 +43,7 @@ int get_u32(__u32 *val, const char *arg, int base)
        return 0;
 }
 
-int get_u32_handle(__u32 *handle, const char *str)
+static int get_u32_handle(__u32 *handle, const char *str)
 {
        __u32 htid=0, hash=0, nodeid=0;
        char *tmp = strchr(str, ':');
@@ -78,7 +78,7 @@ int get_u32_handle(__u32 *handle, const char *str)
        return 0;
 }
 
-uint32_t get_u32_parse_handle(const char *cHandle)
+static uint32_t get_u32_parse_handle(const char *cHandle)
 {
        uint32_t handle=0;
 
@@ -94,7 +94,7 @@ uint32_t get_u32_parse_handle(const char *cHandle)
        return handle;
 }
 
-int get_tc_classid(__u32 *h, const char *str)
+static int get_tc_classid(__u32 *h, const char *str)
 {
        __u32 maj, min;
        char *p;
@@ -134,7 +134,7 @@ ok:
  * Function that adds a new filter and attach it to a hash table
  *
  */
-int u32_add_filter_on_ht(struct nl_sock *sock, struct rtnl_link *rtnlLink, uint32_t prio, 
+static int u32_add_filter_on_ht(struct nl_sock *sock, struct rtnl_link *rtnlLink, uint32_t prio, 
                uint32_t keyval, uint32_t keymask, int keyoff, int keyoffmask,
                uint32_t htid, uint32_t classid
 )
@@ -186,7 +186,7 @@ int u32_add_filter_on_ht(struct nl_sock *sock, struct rtnl_link *rtnlLink, uint3
  * and set next hash table link with hash mask
  *
  */
-int u32_add_filter_on_ht_with_hashmask(struct nl_sock *sock, struct rtnl_link *rtnlLink, uint32_t prio, 
+static int u32_add_filter_on_ht_with_hashmask(struct nl_sock *sock, struct rtnl_link *rtnlLink, uint32_t prio, 
            uint32_t keyval, uint32_t keymask, int keyoff, int keyoffmask,
            uint32_t htid, uint32_t htlink, uint32_t hmask, uint32_t hoffset
 )
@@ -237,7 +237,7 @@ int u32_add_filter_on_ht_with_hashmask(struct nl_sock *sock, struct rtnl_link *r
 /* 
  * function that creates a new hash table 
  */
-int u32_add_ht(struct nl_sock *sock, struct rtnl_link *rtnlLink, uint32_t prio, uint32_t htid, uint32_t divisor)
+static int u32_add_ht(struct nl_sock *sock, struct rtnl_link *rtnlLink, uint32_t prio, uint32_t htid, uint32_t divisor)
 {
 
     int err;
@@ -276,7 +276,7 @@ int u32_add_ht(struct nl_sock *sock, struct rtnl_link *rtnlLink, uint32_t prio,
 /*
  * function that adds a new HTB qdisc and set the default class for unclassified traffic
  */
-int qdisc_add_HTB(struct nl_sock *sock, struct rtnl_link *rtnlLink, uint32_t defaultClass)
+static int qdisc_add_HTB(struct nl_sock *sock, struct rtnl_link *rtnlLink, uint32_t defaultClass)
 {
     
     struct rtnl_qdisc *qdisc;
@@ -326,7 +326,7 @@ int qdisc_add_HTB(struct nl_sock *sock, struct rtnl_link *rtnlLink, uint32_t def
 /*
  * function that adds a new HTB class and set its parameters
  */
-int class_add_HTB(struct nl_sock *sock, struct rtnl_link *rtnlLink, 
+static int class_add_HTB(struct nl_sock *sock, struct rtnl_link *rtnlLink, 
                    uint32_t parentMaj, uint32_t parentMin,
                    uint32_t childMaj,  uint32_t childMin, 
                    uint64_t rate, uint64_t ceil,
@@ -388,7 +388,7 @@ int class_add_HTB(struct nl_sock *sock, struct rtnl_link *rtnlLink,
 /*
  * function that adds a HTB root class and set its parameters
  */
-int class_add_HTB_root(struct nl_sock *sock, struct rtnl_link *rtnlLink, 
+static int class_add_HTB_root(struct nl_sock *sock, struct rtnl_link *rtnlLink, 
                        uint64_t rate, uint64_t ceil,
                        uint32_t burst, uint32_t cburst
 )
@@ -443,7 +443,7 @@ int class_add_HTB_root(struct nl_sock *sock, struct rtnl_link *rtnlLink,
 /*
  * function that adds a new SFQ qdisc as a leaf for a HTB class
  */
-int qdisc_add_SFQ_leaf(struct nl_sock *sock, struct rtnl_link *rtnlLink,
+static int qdisc_add_SFQ_leaf(struct nl_sock *sock, struct rtnl_link *rtnlLink,
                        uint32_t parentMaj, uint32_t parentMin, 
                        int quantum, int limit, int perturb
 )

diff --git a/tests/test-create-bridge.c b/tests/test-create-bridge.c
index 7202cd7ee92811d3bed9168dc9407e6d7df1b46f..c4bec375e3c3bcb4417d9f4bf3ac65cc12ee01d6 100644 (file)
--- a/tests/test-create-bridge.c
+++ b/tests/test-create-bridge.c
@@ -5,7 +5,7 @@
 #define TEST_BRIDGE_NAME "testbridge"
 #define TEST_INTERFACE_NAME "testtap1"
 
-int create_bridge(struct nl_sock *sk, struct nl_cache *link_cache, const char *name) {
+static int create_bridge(struct nl_sock *sk, struct nl_cache *link_cache, const char *name) {
        struct rtnl_link *link;
        int err;
 

diff --git a/tests/util.h b/tests/util.h
index c6753835d42ead6676118d3f1aee53dfa106227f..cd383ef8233eb749f4cae739875600bf0894a809 100644 (file)
--- a/tests/util.h
+++ b/tests/util.h
@@ -3,3 +3,7 @@
 #define nl_fail_if(condition, error, message) \
        fail_if((condition), "nlerr=%d (%s): %s", \
                (error), nl_geterror(error), (message))
+
+Suite *make_nl_attr_suite(void);
+Suite *make_nl_addr_suite(void);
+