pk.h: handle gcc compiler warnings; breaking changes

1 files changed, 20 insertions, 20 deletions

diff --git a/pkstr.h b/pkstr.h
index 429a234..3ba0630 100644
--- a/pkstr.h
+++ b/pkstr.h
@@ -31,41 +31,41 @@ int pk_compare_cstr(const struct pk_cstr *lhs, const struct pk_cstr *rhs);
 struct pk_str
 cstring_to_pk_str(char *s)
 {
-	return (struct pk_str) {
-		.val = s,
-		.length = (uint32_t)(strlen(s)),
-		.reserved = 0,
-	};
+	struct pk_str ret;
+	ret.val = s;
+	ret.length = (uint32_t)(strlen(s));
+	ret.reserved = 0;
+	return ret;
 }
 
 struct pk_cstr
 cstring_to_pk_cstr(const char *s)
 {
-	return (struct pk_cstr) {
-		.val = s,
-		.length = (uint32_t)(strlen(s)),
-		.reserved = 0,
-	};
+	struct pk_cstr ret;
+	ret.val = s;
+	ret.length = (uint32_t)(strlen(s));
+	ret.reserved = 0;
+	return ret;
 }
 
 struct pk_str
 pk_cstr_to_pk_str(const struct pk_cstr *s)
 {
-	return (struct pk_str) {
-		.val = (char *)(s->val),
-		.length = s->length,
-		.reserved = s->reserved,
-	};
+	struct pk_str ret;
+	ret.val = (char *)s->val;
+	ret.length = s->length;
+	ret.reserved = s->reserved;
+	return ret;
 }
 
 struct pk_cstr
 pk_str_to_pk_cstr(const struct pk_str *s)
 {
-	return (struct pk_cstr) {
-		.val = (char *)(s->val),
-		.length = s->length,
-		.reserved = s->reserved,
-	};
+	struct pk_cstr ret;
+	ret.val = (char *)s->val;
+	ret.length = s->length;
+	ret.reserved = s->reserved;
+	return ret;
 }
 
 int