diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2016-08-23 17:35:26 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2016-08-23 17:35:26 +0200 |
| commit | 768d013267bd2a52bab70ba6d413f49365fb31e3 (patch) | |
| tree | ecde9e8ee306aa18a6850d6b7668c1f6a119a8cb | |
| parent | 678c97f21ef15c98546f41647f3244799a37db1f (diff) | |
| parent | d107ef78df2564cba75af1a6dcc9894c4468b207 (diff) | |
Merge remote-tracking branch 'origin/misc-fixes'
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | conf/cf-lex.l | 1 | ||||
| -rw-r--r-- | filter/filter.c | 2 | ||||
| -rw-r--r-- | filter/tree.c | 4 | ||||
| -rw-r--r-- | lib/printf.c | 2 | ||||
| -rw-r--r-- | nest/rt-table.c | 2 | ||||
| -rw-r--r-- | sysdep/unix/io.c | 2 |
7 files changed, 15 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..77dea498 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +/Makefile +/bird +/birdc +/birdcl +/config.log +/config.status +/configure +/obj/ diff --git a/conf/cf-lex.l b/conf/cf-lex.l index 727dc017..61ea4527 100644 --- a/conf/cf-lex.l +++ b/conf/cf-lex.l @@ -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> diff --git a/filter/filter.c b/filter/filter.c index 30571e5a..ccdfed36 100644 --- a/filter/filter.c +++ b/filter/filter.c @@ -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; } /** diff --git a/filter/tree.c b/filter/tree.c index ee9f448a..59ebf579 100644 --- a/filter/tree.c +++ b/filter/tree.c @@ -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; diff --git a/lib/printf.c b/lib/printf.c index a067fe98..4fd75c9b 100644 --- a/lib/printf.c +++ b/lib/printf.c @@ -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; diff --git a/nest/rt-table.c b/nest/rt-table.c index 50c01c88..9baf2849 100644 --- a/nest/rt-table.c +++ b/nest/rt-table.c @@ -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; diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index 8198743d..120eb906 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -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); |