Merge pull request #1049 from opensourcerouting/openbsd-warnings

fix warnings on OpenBSD

4 files changed, 61 insertions, 45 deletions

diff --git a/lib/module.c b/lib/module.c
index beef791093..b3ab91c4ea 100644
--- a/lib/module.c
+++ b/lib/module.c
@@ -42,8 +42,10 @@ static struct frrmod_info frrmod_default_info = {
 	.description = "libfrr core module",
 };
 union _frrmod_runtime_u frrmod_default = {
-	.r.info = &frrmod_default_info,
-	.r.finished_loading = 1,
+	.r = {
+		.info = &frrmod_default_info,
+		.finished_loading = 1,
+	},
 };
 
 // if defined(HAVE_SYS_WEAK_ALIAS_ATTRIBUTE)
diff --git a/lib/prefix.h b/lib/prefix.h
index eab4ac2bb7..a27f46ba0a 100644
--- a/lib/prefix.h
+++ b/lib/prefix.h
@@ -125,7 +125,7 @@ struct prefix {
 			struct in_addr adv_router;
 		} lp;
 		struct ethaddr prefix_eth; /* AF_ETHERNET */
-		u_char val[8];
+		u_char val[16];
 		uintptr_t ptr;
 		struct evpn_addr prefix_evpn; /* AF_EVPN */
 	} u __attribute__((aligned(8)));
diff --git a/lib/spf_backoff.c b/lib/spf_backoff.c
index d075e70d4e..92b7620eda 100644
--- a/lib/spf_backoff.c
+++ b/lib/spf_backoff.c
@@ -226,8 +226,9 @@ void spf_backoff_show(struct spf_backoff *backoff, struct vty *vty,
 	if (backoff->t_holddown) {
 		struct timeval remain =
 			thread_timer_remain(backoff->t_holddown);
-		vty_out(vty, "%s                   Still runs for %ld msec\n",
-			prefix, remain.tv_sec * 1000 + remain.tv_usec / 1000);
+		vty_out(vty, "%s                   Still runs for %lld msec\n",
+			prefix, (long long)remain.tv_sec * 1000
+				+ remain.tv_usec / 1000);
 	} else {
 		vty_out(vty, "%s                   Inactive\n", prefix);
 	}
@@ -237,8 +238,9 @@ void spf_backoff_show(struct spf_backoff *backoff, struct vty *vty,
 	if (backoff->t_timetolearn) {
 		struct timeval remain =
 			thread_timer_remain(backoff->t_timetolearn);
-		vty_out(vty, "%s                   Still runs for %ld msec\n",
-			prefix, remain.tv_sec * 1000 + remain.tv_usec / 1000);
+		vty_out(vty, "%s                   Still runs for %lld msec\n",
+			prefix, (long long)remain.tv_sec * 1000
+				+ remain.tv_usec / 1000);
 	} else {
 		vty_out(vty, "%s                   Inactive\n", prefix);
 	}
diff --git a/lib/termtable.c b/lib/termtable.c
index f7aec43118..ba85962cc9 100644
--- a/lib/termtable.c
+++ b/lib/termtable.c
@@ -31,48 +31,60 @@ struct ttable_style ttable_styles[] = {
 		.corner = '+',
 		.rownums_on = false,
 		.indent = 1,
-		.border.top = '-',
-		.border.bottom = '-',
-		.border.left = '|',
-		.border.right = '|',
-		.border.top_on = true,
-		.border.bottom_on = true,
-		.border.left_on = true,
-		.border.right_on = true,
-		.cell.lpad = 1,
-		.cell.rpad = 1,
-		.cell.align = LEFT,
-		.cell.border.bottom = '-',
-		.cell.border.bottom_on = true,
-		.cell.border.top = '-',
-		.cell.border.top_on = false,
-		.cell.border.right = '|',
-		.cell.border.right_on = true,
-		.cell.border.left = '|',
-		.cell.border.left_on = false,
+		.border = {
+			.top = '-',
+			.bottom = '-',
+			.left = '|',
+			.right = '|',
+			.top_on = true,
+			.bottom_on = true,
+			.left_on = true,
+			.right_on = true,
+		},
+		.cell = {
+			.lpad = 1,
+			.rpad = 1,
+			.align = LEFT,
+			.border = {
+				.bottom = '-',
+				.bottom_on = true,
+				.top = '-',
+				.top_on = false,
+				.right = '|',
+				.right_on = true,
+				.left = '|',
+				.left_on = false,
+			},
+		},
 	}, {	// blank, suitable for plaintext alignment
 		.corner = ' ',
 		.rownums_on = false,
 		.indent = 1,
-		.border.top = ' ',
-		.border.bottom = ' ',
-		.border.left = ' ',
-		.border.right = ' ',
-		.border.top_on = false,
-		.border.bottom_on = false,
-		.border.left_on = false,
-		.border.right_on = false,
-		.cell.lpad = 0,
-		.cell.rpad = 3,
-		.cell.align = LEFT,
-		.cell.border.bottom = ' ',
-		.cell.border.bottom_on = false,
-		.cell.border.top = ' ',
-		.cell.border.top_on = false,
-		.cell.border.right = ' ',
-		.cell.border.right_on = false,
-		.cell.border.left = ' ',
-		.cell.border.left_on = false,
+		.border = {
+			.top = ' ',
+			.bottom = ' ',
+			.left = ' ',
+			.right = ' ',
+			.top_on = false,
+			.bottom_on = false,
+			.left_on = false,
+			.right_on = false,
+		},
+		.cell = {
+			.lpad = 0,
+			.rpad = 3,
+			.align = LEFT,
+			.border = {
+				.bottom = ' ',
+				.bottom_on = false,
+				.top = ' ',
+				.top_on = false,
+				.right = ' ',
+				.right_on = false,
+				.left = ' ',
+				.left_on = false,
+			},
+		}
    }
 };
 /* clang-format on */