libnl-pedantic.patch

   1 diff -ur libnl-3.2.0.org/include/netlink/attr.h libnl-3.2.0/include/netlink/attr.h
   2 --- libnl-3.2.0.org/include/netlink/attr.h      2011-08-16 16:16:01.000000000 +0200
   3 +++ libnl-3.2.0/include/netlink/attr.h  2011-09-17 08:56:26.044922372 +0200
   4 @@ -44,7 +44,7 @@
   5         NLA_FLAG,       /**< Flag */
   6         NLA_MSECS,      /**< Micro seconds (64bit) */
   7         NLA_NESTED,     /**< Nested attributes */
   8 -       __NLA_TYPE_MAX,
   9 +       __NLA_TYPE_MAX
  10  };
  11
  12  #define NLA_TYPE_MAX (__NLA_TYPE_MAX - 1)
  13 diff -ur libnl-3.2.0.org/include/netlink/handlers.h libnl-3.2.0/include/netlink/handlers.h
  14 --- libnl-3.2.0.org/include/netlink/handlers.h  2011-08-16 16:16:01.000000000 +0200
  15 +++ libnl-3.2.0/include/netlink/handlers.h      2011-09-17 08:57:06.462565163 +0200
  16 @@ -62,7 +62,7 @@
  17         /** Skip this message */
  18         NL_SKIP,
  19         /** Stop parsing altogether and discard remaining messages */
  20 -       NL_STOP,
  21 +       NL_STOP
  22  };
  23
  24  /**
  25 @@ -78,7 +78,7 @@
  26         NL_CB_DEBUG,
  27         /** Customized handler specified by the user */
  28         NL_CB_CUSTOM,
  29 -       __NL_CB_KIND_MAX,
  30 +       __NL_CB_KIND_MAX
  31  };
  32
  33  #define NL_CB_KIND_MAX (__NL_CB_KIND_MAX - 1)
  34 @@ -110,7 +110,7 @@
  35         NL_CB_SEND_ACK,
  36         /** Flag NLM_F_DUMP_INTR is set in message */
  37         NL_CB_DUMP_INTR,
  38 -       __NL_CB_TYPE_MAX,
  39 +       __NL_CB_TYPE_MAX
  40  };
  41
  42  #define NL_CB_TYPE_MAX (__NL_CB_TYPE_MAX - 1)
  43 diff -ur libnl-3.2.0.org/include/netlink/netfilter/log.h libnl-3.2.0/include/netlink/netfilter/log.h
  44 --- libnl-3.2.0.org/include/netlink/netfilter/log.h     2011-08-16 16:16:01.000000000 +0200
  45 +++ libnl-3.2.0/include/netlink/netfilter/log.h 2011-09-17 08:57:30.113135916 +0200
  46 @@ -30,12 +30,12 @@
  47  enum nfnl_log_copy_mode {
  48         NFNL_LOG_COPY_NONE,
  49         NFNL_LOG_COPY_META,
  50 -       NFNL_LOG_COPY_PACKET,
  51 +       NFNL_LOG_COPY_PACKET
  52  };
  53
  54  enum nfnl_log_flags {
  55         NFNL_LOG_FLAG_SEQ               = 0x1,
  56 -       NFNL_LOG_FLAG_SEQ_GLOBAL        = 0x2,
  57 +       NFNL_LOG_FLAG_SEQ_GLOBAL        = 0x2
  58  };
  59
  60  /* General */
  61 diff -ur libnl-3.2.0.org/include/netlink/netfilter/queue.h libnl-3.2.0/include/netlink/netfilter/queue.h
  62 --- libnl-3.2.0.org/include/netlink/netfilter/queue.h   2011-08-16 16:16:01.000000000 +0200
  63 +++ libnl-3.2.0/include/netlink/netfilter/queue.h       2011-09-17 08:57:40.600055691 +0200
  64 @@ -27,7 +27,7 @@
  65  enum nfnl_queue_copy_mode {
  66         NFNL_QUEUE_COPY_NONE,
  67         NFNL_QUEUE_COPY_META,
  68 -       NFNL_QUEUE_COPY_PACKET,
  69 +       NFNL_QUEUE_COPY_PACKET
  70  };
  71
  72  /* General */
  73 --- libnl-3.2.25/include/netlink/route/link.h.orig      2014-07-19 07:53:57.189749709 +0200
  74 +++ libnl-3.2.25/include/netlink/route/link.h   2014-07-19 08:24:18.749673265 +0200
  75 @@ -99,7 +99,7 @@
  76         RTNL_LINK_IP6_ECT1PKTS,         /*!< IPv6 SNMP InECT1Pkts */
  77         RTNL_LINK_IP6_ECT0PKTS,         /*!< IPv6 SNMP InECT0Pkts */
  78         RTNL_LINK_IP6_CEPKTS,           /*!< IPv6 SNMP InCEPkts */
  79 -       __RTNL_LINK_STATS_MAX,
  80 +       __RTNL_LINK_STATS_MAX
  81  } rtnl_link_stat_id_t;
  82
  83  #define RTNL_LINK_STATS_MAX (__RTNL_LINK_STATS_MAX - 1)
  84 diff -ur libnl-3.2.0.org/include/netlink/route/nexthop.h libnl-3.2.0/include/netlink/route/nexthop.h
  85 --- libnl-3.2.0.org/include/netlink/route/nexthop.h     2011-08-16 16:16:01.000000000 +0200
  86 +++ libnl-3.2.0/include/netlink/route/nexthop.h 2011-09-17 08:58:11.357465046 +0200
  87 @@ -24,7 +24,7 @@
  88  enum {
  89         NH_DUMP_FROM_ONELINE = -2,
  90         NH_DUMP_FROM_DETAILS = -1,
  91 -       NH_DUMP_FROM_ENV = 0,
  92 +       NH_DUMP_FROM_ENV = 0
  93         /* > 0 reserved for nexthop index */
  94  };
  95
  96 --- libnl-3.2.24/include/netlink/route/tc.h.orig        2013-12-20 10:58:48.000000000 +0100
  97 +++ libnl-3.2.24/include/netlink/route/tc.h     2014-01-25 14:28:35.815740841 +0100
  98 @@ -28,7 +28,7 @@
  99         RTNL_TC_TYPE_CLASS,
 100         RTNL_TC_TYPE_CLS,
 101         RTNL_TC_TYPE_ACT,
 102 -       __RTNL_TC_TYPE_MAX,
 103 +       __RTNL_TC_TYPE_MAX
 104  };
 105
 106  #define RTNL_TC_TYPE_MAX (__RTNL_TC_TYPE_MAX - 1)
 107 @@ -73,7 +73,7 @@
 108         RTNL_TC_DROPS,          /**< Total number of packets dropped */
 109         RTNL_TC_REQUEUES,       /**< Total number of requeues */
 110         RTNL_TC_OVERLIMITS,     /**< Total number of overlimits */
 111 -       __RTNL_TC_STATS_MAX,
 112 +       __RTNL_TC_STATS_MAX
 113  };
 114
 115  #define RTNL_TC_STATS_MAX (__RTNL_TC_STATS_MAX - 1)
 116 diff -ur libnl-3.2.0.org/include/netlink/types.h libnl-3.2.0/include/netlink/types.h
 117 --- libnl-3.2.0.org/include/netlink/types.h     2011-08-16 16:16:01.000000000 +0200
 118 +++ libnl-3.2.0/include/netlink/types.h 2011-09-17 08:59:11.778924754 +0200
 119 @@ -22,7 +22,7 @@
 120         NL_DUMP_LINE,           /**< Dump object briefly on one line */
 121         NL_DUMP_DETAILS,        /**< Dump all attributes but no statistics */
 122         NL_DUMP_STATS,          /**< Dump all attributes including statistics */
 123 -       __NL_DUMP_MAX,
 124 +       __NL_DUMP_MAX
 125  };
 126  #define NL_DUMP_MAX (__NL_DUMP_MAX - 1)
 127
 128 diff -ur libnl-3.2.0.org/include/netlink/utils.h libnl-3.2.0/include/netlink/utils.h
 129 --- libnl-3.2.0.org/include/netlink/utils.h     2011-08-16 16:16:01.000000000 +0200
 130 +++ libnl-3.2.0/include/netlink/utils.h 2011-09-17 08:59:19.612448026 +0200
 131 @@ -40,7 +40,7 @@
 132
 133  enum {
 134         NL_BYTE_RATE,
 135 -       NL_BIT_RATE,
 136 +       NL_BIT_RATE
 137  };
 138
 139  /* unit pretty-printing */