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

.gitignore

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

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>

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;
 }
 
 /**

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;
  

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;

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;

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);