From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 20 Jul 2020 02:26:56 +0000 (-0400)
Subject: sbuff/dbuff: Use compound literals as initialisers
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1698381d28694c2cf65616425f602a37fd9d635d;p=thirdparty%2Ffreeradius-server.git

sbuff/dbuff: Use compound literals as initialisers
---

diff --git a/src/lib/util/dbuff.h b/src/lib/util/dbuff.h
index 93c09a000a5..e14079ea041 100644
--- a/src/lib/util/dbuff.h
+++ b/src/lib/util/dbuff.h
@@ -189,10 +189,12 @@ static inline void _fr_dbuff_init(fr_dbuff_t *out, uint8_t const *start, uint8_t
 {
 	if (unlikely(end < start)) end = start;	/* Could be an assert? */
 
-	out->p_i = out->start_i = start;
-	out->end_i = end;
-	out->is_const = is_const;
-	out->parent = NULL;
+	*out = (fr_dbuff_t){
+		.start_i = start,
+		.p_i = start,
+		.end_i = end,
+		.is_const = is_const
+	};
 }
 
 /** Initialise an dbuff for encoding or decoding
diff --git a/src/lib/util/sbuff.h b/src/lib/util/sbuff.h
index 7d14ac67c07..d16d39de705 100644
--- a/src/lib/util/sbuff.h
+++ b/src/lib/util/sbuff.h
@@ -462,10 +462,12 @@ static inline void _fr_sbuff_in_init(fr_sbuff_t *out, char *start, char *end, fr
 {
 	if (unlikely((end - 1) < start)) end = start;	/* Could be an assert? */
 
-	out->p = out->start = start;
-	out->end = (end - 1);				/* Always leave room for \0 byte */
-	out->is_const = false;
-	out->extend = extend;
+	*out = (fr_sbuff_t){
+		.start = start,
+		.p = start,
+		.end = (end - 1),
+		.extend = extend
+	};
 }
 
 ssize_t		fr_sbuff_in_strcpy(fr_sbuff_t *sbuff, char const *str);
@@ -493,9 +495,12 @@ static inline void _fr_sbuff_out_init(fr_sbuff_t *out, char const *start, char c
 {
 	if (unlikely(end < start)) end = start;	/* Could be an assert? */
 
-	out->p_i = out->start_i = start;
-	out->end_i = end;
-	out->is_const = is_const;
+	*out = (fr_sbuff_t){
+		.start_i = start,
+		.p_i = start,
+		.end_i = end,
+		.is_const = is_const
+	};
 }
 
 /** Initialise an sbuff for binary safe string parsing