Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Ondrej Zajicek (work) 2016-08-23 17:35:26 +02:00
commit 768d013267
7 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitignore vendored Normal file
View file

@ -0,0 +1,8 @@
/Makefile
/bird
/birdc
/birdcl
/config.log
/config.status
/configure
/obj/

1
conf/cf-lex.l
View file

@ -30,6 +30,7 @@
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdint.h>
#include <unistd.h> #include <unistd.h>
#include <libgen.h> #include <libgen.h>
#include <glob.h> #include <glob.h>

2
filter/filter.c
View file

@ -185,7 +185,7 @@ pm_same(struct f_path_mask *m1, struct f_path_mask *m2)
m2 = m2->next; m2 = m2->next;
} }
return !m1 && !m2; return !m1 && !m2;
} }
/** /**

4
filter/tree.c
View file

@ -163,9 +163,9 @@ tree_format(struct f_tree *t, buffer *buf)
{ {
buffer_puts(buf, "["); buffer_puts(buf, "[");
tree_node_format(t, buf); tree_node_format(t, buf);
/* Undo last separator */ /* Undo last separator */
if (buf->pos[-1] != '[') if (buf->pos[-1] != '[')
buf->pos -= 2; buf->pos -= 2;

2
lib/printf.c
View file

@ -169,7 +169,7 @@ int bvsnprintf(char *buf, int size, const char *fmt, va_list args)
case ' ': flags |= SPACE; goto repeat; case ' ': flags |= SPACE; goto repeat;
case '#': flags |= SPECIAL; goto repeat; case '#': flags |= SPECIAL; goto repeat;
case '0': flags |= ZEROPAD; goto repeat; case '0': flags |= ZEROPAD; goto repeat;
} }
/* get field width */ /* get field width */
field_width = -1; field_width = -1;

2
nest/rt-table.c
View file

@ -1777,7 +1777,7 @@ rt_next_hop_update_net(rtable *tab, net *n)
/* FIXME: Better announcement of merged routes */ /* FIXME: Better announcement of merged routes */
rte_announce_i(tab, RA_MERGED, n, new, old_best, new, old_best); 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); rte_free_quick(old_best);
return count; return count;

2
sysdep/unix/io.c
View file

@ -2235,7 +2235,7 @@ io_loop(void)
if (pfd[s->index].revents & (POLLHUP | POLLERR)) if (pfd[s->index].revents & (POLLHUP | POLLERR))
{ {
sk_err(s, pfd[s->index].revents); sk_err(s, pfd[s->index].revents);
goto next2; goto next2;
} }
current_sock = sk_next(s); current_sock = sk_next(s);