fix: resolve char/u_char pointer-sign compiler warnings (#426)

Adds explicit casts at the char*/u_char* boundary throughout
libopendmarc and the milter, eliminating -Wpointer-sign and a stray
nested-comment warning surfaced by a non-CI build (CI suppresses
these via -Wno-pointer-sign). Also drops two backwards casts on
dfc->mctx_jobid (char *) and fixes a real -Wincompatible-pointer-types
mismatch in the ignorereceivers history path.

Author: thegushi

libopendmarc/opendmarc_policy.c

@@ -47,14 +47,14 @@ opendmarc_reverse_domain(u_char *domain, u_char *buf, size_t buflen)
 		if (*cp !=  '.')
 			break;
 	}
-	if (strlen(cp) == 0)
+	if (strlen((char *)cp) == 0)
 	{
 		return EINVAL;
 	}
 	if (cp > domain)
 		--cp;
 	(void) memset((char *)copy, '\0', sizeof copy);
-	(void) strlcpy((char *)copy, cp, sizeof copy);
+	(void) strlcpy((char *)copy, (char *)cp, sizeof copy);
 	ep = copy + strlen((char *)copy);
 
 	/*
@@ -188,7 +188,7 @@ opendmarc_tld_read_file(char *path_fname, char *commentstring, char *drop, char
 		if (adddot == TRUE)
 			(void) strlcat((char *)revbuf, ".", sizeof revbuf);
 
-		if (opendmarc_hash_lookup(hashp, revbuf, (void *)revbuf, strlen(revbuf)) == NULL)
+		if (opendmarc_hash_lookup(hashp, (char *)revbuf, (void *)revbuf, strlen((char *)revbuf)) == NULL)
 			return 1;
 		nlines++;
 	}
@@ -261,16 +261,16 @@ opendmarc_get_tld(u_char *domain, u_char *tld, size_t tld_len)
 		/*
 		** No tld list was supplied so copy the domain and return.
 		*/
-		(void) strlcpy(tld, domain, tld_len);
+		(void) strlcpy((char *)tld, (char *)domain, tld_len);
 		return 0;
 	}
 
-	for (rp = revbuf + strlen(revbuf) -1; rp > revbuf; --rp)
+	for (rp = revbuf + strlen((char *)revbuf) -1; rp > revbuf; --rp)
 	{
 		if (rp == revbuf)
 		{
 			/* no match found in the hash table. */
-			(void) strlcpy(tld, domain, tld_len);
+			(void) strlcpy((char *)tld, (char *)domain, tld_len);
 			break;
 		}
 		if (*rp == '.')
@@ -280,7 +280,7 @@ opendmarc_get_tld(u_char *domain, u_char *tld, size_t tld_len)
 # if HAVE_PTHREAD_H || HAVE_PTHREAD
 			(void) pthread_mutex_lock(&TLD_hctx_mutex);
 # endif
-			vp = opendmarc_hash_lookup(TLD_hctx, revbuf, NULL, 0);
+			vp = opendmarc_hash_lookup(TLD_hctx, (char *)revbuf, NULL, 0);
 # if HAVE_PTHREAD_H || HAVE_PTHREAD
 			(void) pthread_mutex_unlock(&TLD_hctx_mutex);
 # endif
@@ -295,13 +295,13 @@ opendmarc_get_tld(u_char *domain, u_char *tld, size_t tld_len)
 # if HAVE_PTHREAD_H || HAVE_PTHREAD
 			(void) pthread_mutex_lock(&TLD_hctx_mutex);
 # endif
-			vp = opendmarc_hash_lookup(TLD_hctx, revbuf, NULL, 0);
+			vp = opendmarc_hash_lookup(TLD_hctx, (char *)revbuf, NULL, 0);
 # if HAVE_PTHREAD_H || HAVE_PTHREAD
 			(void) pthread_mutex_unlock(&TLD_hctx_mutex);
 # endif
 			if (vp != NULL)
 			{
-				char * cp = strchr(revbuf, '.');
+				char * cp = strchr((char *)revbuf, '.');
 
 				if (cp == NULL)
 					*rp = '.';

libopendmarc/opendmarc_tld.c

@@ -76,7 +76,7 @@ opendmarc_util_pushargv(u_char *str, u_char **ary, int *cnt)
 		{
 			return NULL;
 		}
-		ary[0] = strdup(str);
+		ary[0] = (u_char *)strdup((char *)str);
 		ary[1] = NULL;
 		if (ary[0] == NULL)
 		{
@@ -104,7 +104,7 @@ opendmarc_util_pushargv(u_char *str, u_char **ary, int *cnt)
 		return NULL;
 	}
 	ary = tmp;
-	ary[i] = strdup(str);
+	ary[i] = (u_char *)strdup((char *)str);
 	if (ary[i] == NULL)
 	{
 		ary = opendmarc_util_clearargv(ary);
@@ -168,7 +168,7 @@ opendmarc_util_cleanup(u_char *str, u_char *buf, size_t buflen)
 
 	(void) memset(buf, '\0', buflen);
 
-	for (sp = str, ep = buf; *sp != '\0'; sp++)
+	for (sp = (char *)str, ep = (char *)buf; *sp != '\0'; sp++)
 	{
 		if (!isascii(*sp) || !isspace(*sp))
 			*ep++ = *sp;
@@ -214,7 +214,7 @@ opendmarc_util_finddomain(u_char *raw, u_char *buf, size_t buflen)
 	len = strlen((char *)raw);
 	if (len > BUFSIZ)
 		len = BUFSIZ - 1;
-	(void) strncpy(copy, raw, len);
+	(void) strncpy((char *)copy, (char *)raw, len);
 
 	/*
 	 * Quoted commas do not delimit addresses.
@@ -354,7 +354,7 @@ opendmarc_util_finddomain(u_char *raw, u_char *buf, size_t buflen)
 strip_local_part:
 	if (cp == NULL)
 		cp = copy;
-	ep = strchr(cp, '@');
+	ep = (u_char *)strchr((char *)cp, '@');
 	if (ep != NULL)
 		cp = ep + 1;
 	len = strlen((char *)cp);
@@ -370,7 +370,7 @@ opendmarc_util_finddomain(u_char *raw, u_char *buf, size_t buflen)
 		if (*ep == '.')
 			*ep = '\0';
 	}
-	(void) strlcpy(buf, cp, buflen);
+	(void) strlcpy((char *)buf, (char *)cp, buflen);
 	return buf;
 }
 

libopendmarc/opendmarc_util.c

@@ -120,7 +120,7 @@ opendmarc_arcares_strip_whitespace(u_char *string)
 	/* set remaining chars to null */
 	memset(&string[a], '\0', b - a);
 
-	return string;
+	return (char *)string;
 }
 
 /*
@@ -196,7 +196,7 @@ opendmarc_arcares_arc_parse (struct arcares *aar,
 					if (p_found++)
 						return -1;
 
-					strlcpy(arc->smtpclientip,
+					strlcpy((char *)arc->smtpclientip,
 					        (char *) arc->arcresult.result_value[cp],
 					        sizeof arc->smtpclientip);
 				}

opendmarc/opendmarc-arcares.c

@@ -113,7 +113,7 @@ opendmarc_arcseal_strip_whitespace(u_char *string)
 	/* set remaining chars to null */
 	memset(&string[a], '\0', b - a);
 
-	return string;
+	return (char *)string;
 }
 
 /*
@@ -145,54 +145,54 @@ opendmarc_arcseal_parse(u_char *hdr, struct arcseal *as)
 	memset(tmp, '\0', sizeof tmp);
 
 	// guarantee a null-terminated string
-	memcpy(tmp, hdr, MIN(strlen(hdr), sizeof tmp - 1));
+	memcpy(tmp, hdr, MIN(strlen((char *)hdr), sizeof tmp - 1));
 
-	while ((token = strsep((char **)&tmp_ptr, ";")) != NULL)
+	while ((token = (u_char *)strsep((char **)&tmp_ptr, ";")) != NULL)
 	{
 		size_t leading_space_len;
 		as_tag_t tag_code;
 		char *token_ptr;
 		char *tag_label;
 		char *tag_value;
 
-		leading_space_len = strspn(token, " \r\n\t");
-		token_ptr = token + leading_space_len;
+		leading_space_len = strspn((char *)token, " \r\n\t");
+		token_ptr = (char *)token + leading_space_len;
 		if (*token_ptr == '\0')
 			return 0;
 		tag_label = strsep(&token_ptr, "=");
 		if (token_ptr == NULL)
 			return -1;
-		tag_value = opendmarc_arcseal_strip_whitespace(token_ptr);
+		tag_value = opendmarc_arcseal_strip_whitespace((u_char *)token_ptr);
 		tag_code = opendmarc_arcseal_convert(as_tags, tag_label);
 
 		switch (tag_code)
 		{
 		  case AS_TAG_ALGORITHM:
-			strlcpy(as->algorithm, tag_value, sizeof as->algorithm);
+			strlcpy((char *)as->algorithm, tag_value, sizeof as->algorithm);
 				break;
 
 		  case AS_TAG_CHAIN_VALIDATION:
-			strlcpy(as->chain_validation, tag_value, sizeof as->chain_validation);
+			strlcpy((char *)as->chain_validation, tag_value, sizeof as->chain_validation);
 			break;
 
 		  case AS_TAG_INSTANCE:
 			as->instance = atoi(tag_value);
 			break;
 
 		  case AS_TAG_SIGNATURE_DOMAIN:
-			strlcpy(as->signature_domain, tag_value, sizeof as->signature_domain);
+			strlcpy((char *)as->signature_domain, tag_value, sizeof as->signature_domain);
 			break;
 
 		  case AS_TAG_SIGNATURE_SELECTOR:
-			strlcpy(as->signature_selector, tag_value, sizeof as->signature_selector);
+			strlcpy((char *)as->signature_selector, tag_value, sizeof as->signature_selector);
 			break;
 
 		  case AS_TAG_SIGNATURE_TIME:
-			strlcpy(as->signature_time, tag_value, sizeof as->signature_time);
+			strlcpy((char *)as->signature_time, tag_value, sizeof as->signature_time);
 			break;
 
 		  case AS_TAG_SIGNATURE_VALUE:
-			strlcpy(as->signature_value, tag_value, sizeof as->signature_value);
+			strlcpy((char *)as->signature_value, tag_value, sizeof as->signature_value);
 			break;
 
 		  default:

opendmarc/opendmarc-arcseal.c

@@ -92,7 +92,7 @@ main(int argc, char **argv)
 		return EX_SOFTWARE;
 	}
 
-	dmarc = opendmarc_policy_connect_init(LOCALHOST, FALSE);
+	dmarc = opendmarc_policy_connect_init((u_char *)LOCALHOST, FALSE);
 	if (dmarc == NULL)
 	{
 		fprintf(stderr, "%s: opendmarc_policy_connect_init() failed\n",
@@ -105,7 +105,7 @@ main(int argc, char **argv)
 	{
 		(void) opendmarc_policy_connect_rset(dmarc);
 
-		status = opendmarc_policy_store_from_domain(dmarc, argv[c]);
+		status = opendmarc_policy_store_from_domain(dmarc, (u_char *)argv[c]);
 		if (status != DMARC_PARSE_OKAY)
 		{
 			fprintf(stderr,