nf: nfnl_*_str2copy_mode() should return int

... to be able to return a negative error code for unknown modes.

[thaller@redhat.com: This is potentially an ABI break, but since
the size of the enum is implementation defined, it seems
anyway unstable to have them as function arguments/return values.]

http://lists.infradead.org/pipermail/libnl/2014-August/001616.html

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Thomas Haller <thaller@redhat.com>

diff --git a/include/netlink/netfilter/log.h b/include/netlink/netfilter/log.h
index 2002fa8bfd1f19d706115b0e259e5c79a9f33b35..e48eddff4fd4b2e6d67b4062c77a8e1f8577ac57 100644 (file)
--- a/include/netlink/netfilter/log.h
+++ b/include/netlink/netfilter/log.h
@@ -58,7 +58,7 @@ extern enum nfnl_log_copy_mode        nfnl_log_get_copy_mode(const struct nfnl_log *);
 
 extern char *                  nfnl_log_copy_mode2str(enum nfnl_log_copy_mode,
                                                       char *, size_t);
-extern enum nfnl_log_copy_mode nfnl_log_str2copy_mode(const char *);
+extern int                     nfnl_log_str2copy_mode(const char *);
 
 extern void                    nfnl_log_set_copy_range(struct nfnl_log *, uint32_t);
 extern int                     nfnl_log_test_copy_range(const struct nfnl_log *);

diff --git a/include/netlink/netfilter/queue.h b/include/netlink/netfilter/queue.h
index 664610db8c1d8a98838cc1e4c7818374de8a46dd..224d4696947703607200f37c5529abe72e0ea60d 100644 (file)
--- a/include/netlink/netfilter/queue.h
+++ b/include/netlink/netfilter/queue.h
@@ -54,7 +54,7 @@ extern enum nfnl_queue_copy_mode nfnl_queue_get_copy_mode(const struct nfnl_queu
 
 extern char *                  nfnl_queue_copy_mode2str(enum nfnl_queue_copy_mode,
                                                         char *, size_t);
-extern enum nfnl_queue_copy_mode nfnl_queue_str2copy_mode(const char *);
+extern int                     nfnl_queue_str2copy_mode(const char *);
 
 extern void                    nfnl_queue_set_copy_range(struct nfnl_queue *,
                                                          uint32_t);

diff --git a/lib/netfilter/log_obj.c b/lib/netfilter/log_obj.c
index 5e1bf9e6ea74a1bfd557b6c9821af32c7b0ac68c..3fdb3472a3057555f37c70fdef63eaea6a83018f 100644 (file)
--- a/lib/netfilter/log_obj.c
+++ b/lib/netfilter/log_obj.c
@@ -69,7 +69,7 @@ char *nfnl_log_copy_mode2str(enum nfnl_log_copy_mode copy_mode, char *buf,
                          ARRAY_SIZE(copy_modes));
 }
 
-enum nfnl_log_copy_mode nfnl_log_str2copy_mode(const char *name)
+int nfnl_log_str2copy_mode(const char *name)
 {
        return __str2type(name, copy_modes, ARRAY_SIZE(copy_modes));
 }

diff --git a/lib/netfilter/queue_obj.c b/lib/netfilter/queue_obj.c
index b51f5ec1375870c8dc867844b68ce53942f4ee7d..36ed3c53f15c2894fad6bd12f125106be90ac91e 100644 (file)
--- a/lib/netfilter/queue_obj.c
+++ b/lib/netfilter/queue_obj.c
@@ -65,7 +65,7 @@ char *nfnl_queue_copy_mode2str(enum nfnl_queue_copy_mode copy_mode, char *buf,
                           ARRAY_SIZE(copy_modes));
 }
 
-enum nfnl_queue_copy_mode nfnl_queue_str2copy_mode(const char *name)
+int nfnl_queue_str2copy_mode(const char *name)
 {
        return __str2type(name, copy_modes, ARRAY_SIZE(copy_modes));
 }

diff --git a/src/nf-log.c b/src/nf-log.c
index 913ba163de431043371514d180ff04b4ab242cae..c0cffe07b45a79640739685a8726239c75e63e6d 100644 (file)
--- a/src/nf-log.c
+++ b/src/nf-log.c
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
        struct nl_sock *rt_sock;
         struct nl_cache *link_cache;
        struct nfnl_log *log;
-       enum nfnl_log_copy_mode copy_mode;
+       int copy_mode;
        uint32_t copy_range;
        int err;
        int family;

diff --git a/src/nf-queue.c b/src/nf-queue.c
index 922d9c8e9c8bea9bdefdce5ab9740b01ccf978bd..7151381d00ca6f06533d1818f5fe551800eaae3f 100644 (file)
--- a/src/nf-queue.c
+++ b/src/nf-queue.c
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
        struct nl_sock *rt_sock;
        struct nl_cache *link_cache;
        struct nfnl_queue *queue;
-       enum nfnl_queue_copy_mode copy_mode;
+       int copy_mode;
        uint32_t copy_range;
        int err = 1;
        int family;