aboutsummaryrefslogtreecommitdiff
path: root/tools/tools/netmap/lb.c
diff options
context:
space:
mode:
authorVincenzo Maffione <vmaffione@FreeBSD.org>2020-10-03 13:19:48 +0000
committerVincenzo Maffione <vmaffione@FreeBSD.org>2020-10-03 13:19:48 +0000
commit7eb32dc8f003402de96c63dfe6609c57df74342f (patch)
treeca4edccc1f5585c9a1192ae845d31b98e9dad8bd /tools/tools/netmap/lb.c
parentf7265157586a1fa983fb959824d5e701dcf4e4b5 (diff)
downloadsrc-7eb32dc8f003402de96c63dfe6609c57df74342f.tar.gz
src-7eb32dc8f003402de96c63dfe6609c57df74342f.zip
netmap: tools: fix several compiler warnings
MFC after: 1 week
Notes
Notes: svn path=/head/; revision=366393
Diffstat (limited to 'tools/tools/netmap/lb.c')
-rw-r--r--tools/tools/netmap/lb.c39
1 files changed, 20 insertions, 19 deletions
diff --git a/tools/tools/netmap/lb.c b/tools/tools/netmap/lb.c
index 771cf6f18082..b868835c6dc1 100644
--- a/tools/tools/netmap/lb.c
+++ b/tools/tools/netmap/lb.c
@@ -89,7 +89,7 @@ struct compact_ipv6_hdr {
#define BUF_REVOKE 100
#define STAT_MSG_MAXSIZE 1024
-struct {
+static struct {
char ifname[MAX_IFNAMELEN];
char base_name[MAX_IFNAMELEN];
int netmap_fd;
@@ -115,7 +115,7 @@ struct overflow_queue {
uint32_t size;
};
-struct overflow_queue *freeq;
+static struct overflow_queue *freeq;
static inline int
oq_full(struct overflow_queue *q)
@@ -160,12 +160,12 @@ oq_deq(struct overflow_queue *q)
static volatile int do_abort = 0;
-uint64_t dropped = 0;
-uint64_t forwarded = 0;
-uint64_t received_bytes = 0;
-uint64_t received_pkts = 0;
-uint64_t non_ip = 0;
-uint32_t freeq_n = 0;
+static uint64_t dropped = 0;
+static uint64_t forwarded = 0;
+static uint64_t received_bytes = 0;
+static uint64_t received_pkts = 0;
+static uint64_t non_ip = 0;
+static uint32_t freeq_n = 0;
struct port_des {
char interface[MAX_PORTNAMELEN];
@@ -178,7 +178,7 @@ struct port_des {
struct group_des *group;
};
-struct port_des *ports;
+static struct port_des *ports;
/* each group of pipes receives all the packets */
struct group_des {
@@ -190,7 +190,7 @@ struct group_des {
int custom_port;
};
-struct group_des *groups;
+static struct group_des *groups;
/* statistcs */
struct counters {
@@ -205,7 +205,7 @@ struct counters {
#define COUNTERS_FULL 1
};
-struct counters counters_buf;
+static struct counters counters_buf;
static void *
print_stats(void *arg)
@@ -387,7 +387,7 @@ static void sigint_h(int sig)
signal(SIGINT, SIG_DFL);
}
-void usage()
+static void usage()
{
printf("usage: lb [options]\n");
printf("where options are:\n");
@@ -404,9 +404,9 @@ void usage()
}
static int
-parse_pipes(char *spec)
+parse_pipes(const char *spec)
{
- char *end = index(spec, ':');
+ const char *end = index(spec, ':');
static int max_groups = 0;
struct group_des *g;
@@ -458,7 +458,8 @@ parse_pipes(char *spec)
}
/* complete the initialization of the groups data structure */
-void init_groups(void)
+static void
+init_groups(void)
{
int i, j, t = 0;
struct group_des *g = NULL;
@@ -484,7 +485,8 @@ void init_groups(void)
* chain headed by g.
* Return a free buffer.
*/
-uint32_t forward_packet(struct group_des *g, struct netmap_slot *rs)
+static uint32_t
+forward_packet(struct group_des *g, struct netmap_slot *rs)
{
uint32_t hash = rs->ptr;
uint32_t output_port = hash % g->nports;
@@ -886,7 +888,6 @@ run:
*/
for (i = glob_arg.num_groups - 1U; i > 0; i--) {
struct group_des *g = &groups[i - 1];
- int j;
for (j = 0; j < g->nports; j++) {
struct port_des *p = &g->ports[j];
@@ -917,7 +918,7 @@ run:
for (i = 0; i < npipes; i++) {
struct port_des *p = &ports[i];
struct overflow_queue *q = p->oq;
- uint32_t j, lim;
+ uint32_t k, lim;
struct netmap_ring *ring;
struct netmap_slot *slot;
@@ -929,7 +930,7 @@ run:
continue;
if (q->n < lim)
lim = q->n;
- for (j = 0; j < lim; j++) {
+ for (k = 0; k < lim; k++) {
struct netmap_slot s = oq_deq(q), tmp;
tmp.ptr = 0;
slot = &ring->slot[ring->head];