--- embedaddon/mpd/src/contrib/libpdel/structs/type/structs_type_string.c	2013/07/22 08:44:30	1.1.1.1
+++ embedaddon/mpd/src/contrib/libpdel/structs/type/structs_type_string.c	2021/03/17 00:39:23	1.1.1.2
@@ -66,8 +66,8 @@ structs_string_equal(const struct structs_type *type,
 	const void *v1, const void *v2)
 {
 	const int as_null = type->args[1].i;
-	const char *const s1 = *((const char **)v1);
-	const char *const s2 = *((const char **)v2);
+	const char *const s1 = *((const char *const *)v1);
+	const char *const s2 = *((const char *const *)v2);
 	int empty1;
 	int empty2;
 
@@ -87,7 +87,7 @@ structs_string_ascify(const struct structs_type *type,
 	const char *mtype, const void *data)
 {
 	const int as_null = type->args[1].i;
-	const char *s = *((char **)data);
+	const char *s = *((const char *const *)data);
 
 	if (as_null && s == NULL)
 		s = "";
@@ -102,6 +102,8 @@ structs_string_binify(const struct structs_type *type,
 	const int as_null = type->args[1].i;
 	char *s;
 
+	(void)ebuf;
+	(void)emax;
 	if (as_null && *ascii == '\0')
 		s = NULL;
 	else if ((s = STRDUP(mtype, ascii)) == NULL)
@@ -118,7 +120,7 @@ int
 structs_string_encode(const struct structs_type *type, const char *mtype,
 	struct structs_data *code, const void *data)
 {
-	if ((code->data = structs_get_string(type,
+	if ((code->data = (u_char *)structs_get_string(type,
 	    NULL, data, mtype)) == NULL)
 		return (-1);
 	code->length = strlen((char *)code->data) + 1;
@@ -136,7 +138,7 @@ structs_string_decode(const struct structs_type *type,
 	size_t slen;
 
 	/* Determine length of string */
-	for (slen = 0; slen < cmax && ((char *)code)[slen] != '\0'; slen++);
+	for (slen = 0; slen < cmax && code[slen] != '\0'; slen++);
 	if (slen == cmax) {
 		strlcpy(ebuf, "encoded string is truncated", emax);
 		errno = EINVAL;
@@ -179,6 +181,7 @@ structs_bstring_equal(const struct structs_type *type,
 	const char *const s1 = v1;
 	const char *const s2 = v2;
 
+	(void)type;
 	return (strcmp(s1, s2) == 0);
 }
 
@@ -188,6 +191,7 @@ structs_bstring_ascify(const struct structs_type *type
 {
 	const char *const s = data;
 
+	(void)type;
 	return (STRDUP(mtype, s));
 }