Commit 768d0132 authored by Ondřej Zajíček's avatar Ondřej Zajíček

Merge remote-tracking branch 'origin/misc-fixes'

parents 678c97f2 d107ef78
/Makefile
/bird
/birdc
/birdcl
/config.log
/config.status
/configure
/obj/
......@@ -30,6 +30,7 @@
#include <errno.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdint.h>
#include <unistd.h>
#include <libgen.h>
#include <glob.h>
......
......@@ -185,7 +185,7 @@ pm_same(struct f_path_mask *m1, struct f_path_mask *m2)
m2 = m2->next;
}
return !m1 && !m2;
return !m1 && !m2;
}
/**
......
......@@ -163,9 +163,9 @@ tree_format(struct f_tree *t, buffer *buf)
{
buffer_puts(buf, "[");
tree_node_format(t, buf);
tree_node_format(t, buf);
/* Undo last separator */
/* Undo last separator */
if (buf->pos[-1] != '[')
buf->pos -= 2;
......
......@@ -169,7 +169,7 @@ int bvsnprintf(char *buf, int size, const char *fmt, va_list args)
case ' ': flags |= SPACE; goto repeat;
case '#': flags |= SPECIAL; goto repeat;
case '0': flags |= ZEROPAD; goto repeat;
}
}
/* get field width */
field_width = -1;
......
......@@ -1777,7 +1777,7 @@ rt_next_hop_update_net(rtable *tab, net *n)
/* FIXME: Better announcement of merged routes */
rte_announce_i(tab, RA_MERGED, n, new, old_best, new, old_best);
if (free_old_best)
if (free_old_best)
rte_free_quick(old_best);
return count;
......
......@@ -2235,7 +2235,7 @@ io_loop(void)
if (pfd[s->index].revents & (POLLHUP | POLLERR))
{
sk_err(s, pfd[s->index].revents);
goto next2;
goto next2;
}
current_sock = sk_next(s);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment