From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 27 Jun 2022 20:42:29 +0000 (-0500)
Subject: Quiet clangd's linter
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08ed8b63e92f3731e41653eef18e71d6977df568;p=thirdparty%2Ffreeradius-server.git

Quiet clangd's linter
---

diff --git a/scripts/jlibtool.c b/scripts/jlibtool.c
index 3ff518d1dd2..05f9d5219e0 100644
--- a/scripts/jlibtool.c
+++ b/scripts/jlibtool.c
@@ -2462,13 +2462,17 @@ static void post_parse_fixup(command_t *cmd)
 			push_count_chars(cmd->arglist, cmd->output_name);
 		}
 		break;
+		
 	case MODE_LINK:
 		link_fixup(cmd);
 		break;
+
 	case MODE_INSTALL:
 		if (cmd->output == OUT_LIB) {
 			link_fixup(cmd);
 		}
+		break;
+
 	default:
 		break;
 	}
diff --git a/src/lib/server/cf_file.h b/src/lib/server/cf_file.h
index fb86ce316b7..fb3165f410f 100644
--- a/src/lib/server/cf_file.h
+++ b/src/lib/server/cf_file.h
@@ -39,11 +39,6 @@ RCSIDH(cf_file_h, "$Id$")
 extern "C" {
 #endif
 
-#define CF_FILE_NONE   (0)
-#define CF_FILE_ERROR  (1)
-#define CF_FILE_CONFIG (1 << 2)
-#define CF_FILE_MODULE (1 << 3)
-
 /*
  *	Config file parsing
  */
diff --git a/src/lib/server/cf_util.c b/src/lib/server/cf_util.c
index 25d92d30e4b..a7d104670b4 100644
--- a/src/lib/server/cf_util.c
+++ b/src/lib/server/cf_util.c
@@ -578,14 +578,11 @@ bool cf_item_is_data(CONF_ITEM const *ci)
  */
 CONF_PAIR *cf_item_to_pair(CONF_ITEM const *ci)
 {
-	CONF_PAIR *out;
-
 	if (ci == NULL) return NULL;
 
 	fr_assert(ci->type == CONF_ITEM_PAIR);
 
-	memcpy(&out, &ci, sizeof(out));
-	return out;
+	return UNCONST(CONF_PAIR *, ci);
 }
 
 /** Cast a #CONF_ITEM to a #CONF_SECTION
@@ -601,14 +598,11 @@ CONF_PAIR *cf_item_to_pair(CONF_ITEM const *ci)
  */
 CONF_SECTION *cf_item_to_section(CONF_ITEM const *ci)
 {
-	CONF_SECTION *out;
-
 	if (ci == NULL) return NULL;
 
 	fr_assert(ci->type == CONF_ITEM_SECTION);
 
-	memcpy(&out, &ci, sizeof(out));
-	return out;
+	return UNCONST(CONF_SECTION *, ci);
 }
 
 /** Cast #CONF_ITEM to #CONF_DATA performing a type check
@@ -624,14 +618,11 @@ CONF_SECTION *cf_item_to_section(CONF_ITEM const *ci)
  */
 CONF_DATA *cf_item_to_data(CONF_ITEM const *ci)
 {
-	CONF_DATA *out;
-
 	if (ci == NULL) return NULL;
 
 	fr_assert(ci->type == CONF_ITEM_DATA);
 
-	memcpy(&out, &ci, sizeof(out));
-	return out;
+	return UNCONST(CONF_DATA *, ci);
 }
 
 /** Cast a #CONF_PAIR to a #CONF_ITEM
@@ -645,12 +636,9 @@ CONF_DATA *cf_item_to_data(CONF_ITEM const *ci)
  */
 CONF_ITEM *cf_pair_to_item(CONF_PAIR const *cp)
 {
-	CONF_ITEM *out;
-
 	if (cp == NULL) return NULL;
 
-	memcpy(&out, &cp, sizeof(out));
-	return out;
+	return UNCONST(CONF_ITEM *, cp);
 }
 
 /** Cast a #CONF_SECTION to a #CONF_ITEM
@@ -664,12 +652,9 @@ CONF_ITEM *cf_pair_to_item(CONF_PAIR const *cp)
  */
 CONF_ITEM *cf_section_to_item(CONF_SECTION const *cs)
 {
-	CONF_ITEM *out;
-
 	if (cs == NULL) return NULL;
 
-	memcpy(&out, &cs, sizeof(out));
-	return out;
+	return UNCONST(CONF_ITEM *, cs);
 }
 
 /** Cast #CONF_DATA to a #CONF_ITEM
@@ -683,12 +668,9 @@ CONF_ITEM *cf_section_to_item(CONF_SECTION const *cs)
  */
 CONF_ITEM *cf_data_to_item(CONF_DATA const *cd)
 {
-	CONF_ITEM *out;
-
 	if (cd == NULL) return NULL;
 
-	memcpy(&out, &cd, sizeof(out));
-	return out;
+	return UNCONST(CONF_ITEM *, cd);
 }
 
 /** Free a section and associated trees