From 35803045ff749222ab31e3c3312b5c5a3994c412 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Tue, 7 May 2019 21:28:50 -0400
Subject: Do not refer to on-the-fly compound literals out of scope.

---
 src/driver/slbt_driver_ctx.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/driver/slbt_driver_ctx.c')

diff --git a/src/driver/slbt_driver_ctx.c b/src/driver/slbt_driver_ctx.c
index 4ff364b..098ff48 100644
--- a/src/driver/slbt_driver_ctx.c
+++ b/src/driver/slbt_driver_ctx.c
@@ -32,6 +32,16 @@ static const struct slbt_source_version slbt_src_version = {
 	SLIBTOOL_GIT_VERSION
 };
 
+/* default fd context */
+static const struct slbt_fd_ctx slbt_default_fdctx = {
+	.fdin  = STDIN_FILENO,
+	.fdout = STDOUT_FILENO,
+	.fderr = STDERR_FILENO,
+	.fdcwd = AT_FDCWD,
+	.fddst = AT_FDCWD,
+	.fdlog = (-1),
+};
+
 /* flavor settings */
 #define SLBT_FLAVOR_SETTINGS(flavor,          \
 		bfmt,pic,                     \
@@ -1223,16 +1233,8 @@ int slbt_get_driver_ctx(
 
 	argv_optv_init(slbt_default_options,optv);
 
-	if (!fdctx) {
-		fdctx = &(const struct slbt_fd_ctx) {
-			.fdin  = STDIN_FILENO,
-			.fdout = STDOUT_FILENO,
-			.fderr = STDERR_FILENO,
-			.fdlog = (-1),
-			.fdcwd = AT_FDCWD,
-			.fddst = AT_FDCWD,
-		};
-	}
+	if (!fdctx)
+		fdctx = &slbt_default_fdctx;
 
 	sargv.dargs = 0;
 	sargv.dargv = 0;
-- 
cgit v1.2.3