From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 8 Sep 2017 00:20:43 +0000 (-0400)
Subject: I love const
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5e418c6fcacf2a461f78906482955edafdbfabb;p=thirdparty%2Ffreeradius-server.git

I love const

No...
---

diff --git a/src/modules/proto_radius/proto_radius_udp.c b/src/modules/proto_radius/proto_radius_udp.c
index f83d2f2492f..cb1e49caa23 100644
--- a/src/modules/proto_radius/proto_radius_udp.c
+++ b/src/modules/proto_radius/proto_radius_udp.c
@@ -465,7 +465,7 @@ static int mod_open(void *instance)
  */
 static int mod_fd(void const *instance)
 {
-	proto_radius_udp_t *inst = talloc_get_type_abort(instance, proto_radius_udp_t);
+	proto_radius_udp_t const *inst = talloc_get_type_abort(instance, proto_radius_udp_t);
 
 	return inst->sockfd;
 }
@@ -478,7 +478,7 @@ static int mod_fd(void const *instance)
  */
 static void mod_event_list_set(void const *instance, fr_event_list_t *el)
 {
-	proto_radius_udp_t *inst;
+	proto_radius_udp_t const *inst;
 
 	memcpy(&inst, &instance, sizeof(inst)); /* const issues */
 
diff --git a/src/modules/proto_vmps/proto_vmps.c b/src/modules/proto_vmps/proto_vmps.c
index ea69b4c6a7b..74a1b88d9ed 100644
--- a/src/modules/proto_vmps/proto_vmps.c
+++ b/src/modules/proto_vmps/proto_vmps.c
@@ -119,21 +119,21 @@ static int transport_parse(TALLOC_CTX *ctx, void *out, CONF_ITEM *ci, UNUSED CON
  */
 static int mod_decode(void const *instance, REQUEST *request, uint8_t *const data, size_t data_len)
 {
-	proto_vmps_t const *inst = talloc_get_type_abort(instance, proto_vmps_t);
+	proto_vmps_t const *inst = talloc_get_type_abort_const(instance, proto_vmps_t);
 
 	return inst->app_io->decode(inst->app_io_instance, request, data, data_len);
 }
 
 static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffer, size_t buffer_len)
 {
-	proto_vmps_t const *inst = talloc_get_type_abort(instance, proto_vmps_t);
+	proto_vmps_t const *inst = talloc_get_type_abort_const(instance, proto_vmps_t);
 
 	return inst->app_io->encode(inst->app_io_instance, request, buffer, buffer_len);
 }
 
 static void mod_process_set(void const *instance, REQUEST *request)
 {
-	proto_vmps_t const *inst = talloc_get_type_abort(instance, proto_vmps_t);
+	proto_vmps_t const *inst = talloc_get_type_abort_const(instance, proto_vmps_t);
 	fr_io_process_t process;
 
 	rad_assert(request->packet->code != 0);
@@ -305,7 +305,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf)
 	 *	Bootstrap the process modules
 	 */
 	while ((cp = cf_pair_find_next(conf, cp, "type"))) {
-		dl_t const	       *module = talloc_get_type_abort(inst->process_submodule[i]->module, dl_t);
+		dl_t const	       *module = talloc_get_type_abort_const(inst->process_submodule[i]->module, dl_t);
 		fr_app_process_t const *app_process = (fr_app_process_t const *)module->common;
 
 		if (app_process->bootstrap && (app_process->bootstrap(inst->process_submodule[i]->data,
diff --git a/src/modules/proto_vmps/proto_vmps_udp.c b/src/modules/proto_vmps/proto_vmps_udp.c
index 425c6740955..fb7466c4261 100644
--- a/src/modules/proto_vmps/proto_vmps_udp.c
+++ b/src/modules/proto_vmps/proto_vmps_udp.c
@@ -105,7 +105,7 @@ static int mod_dst_address(fr_socket_addr_t *dst, UNUSED void const *instance, v
 static int mod_decode(UNUSED void const *instance, UNUSED REQUEST *request, UNUSED uint8_t *const data, UNUSED size_t data_len)
 {
 #if 0
-//	proto_vmps_udp_t const *inst = talloc_get_type_abort(instance, proto_vmps_udp_t);
+//	proto_vmps_udp_t const *inst = talloc_get_type_abort_const(instance, proto_vmps_udp_t);
 	fr_ip_srcdst_t *ip;
 	uint8_t *packet;
 	size_t packet_len;
@@ -127,7 +127,7 @@ static int mod_decode(UNUSED void const *instance, UNUSED REQUEST *request, UNUS
 static ssize_t mod_encode(UNUSED void const *instance, UNUSED REQUEST *request, UNUSED uint8_t *buffer, UNUSED size_t buffer_len)
 {
 #if 0
-//	proto_vmps_udp_t const *inst = talloc_get_type_abort(instance, proto_vmps_udp_t);
+//	proto_vmps_udp_t const *inst = talloc_get_type_abort_const(instance, proto_vmps_udp_t);
 	fr_ip_srcdst_t *ip;
 	uint8_t *packet;
 	size_t packet_len;
@@ -146,7 +146,7 @@ static ssize_t mod_encode(UNUSED void const *instance, UNUSED REQUEST *request,
 
 static ssize_t mod_read(void const *instance, void **packet_ctx, fr_time_t **recv_time, uint8_t *buffer, size_t buffer_len, size_t *leftover, uint32_t *priority)
 {
-	proto_vmps_udp_t const	*inst = talloc_get_type_abort(instance, proto_vmps_udp_t);
+	proto_vmps_udp_t const		*inst = talloc_get_type_abort_const(instance, proto_vmps_udp_t);
 	fr_ip_srcdst_t			*ip;
 	uint8_t				*packet;
 	size_t				packet_len;
@@ -223,7 +223,7 @@ static ssize_t mod_write(void *instance, void *packet_ctx,
  */
 static int mod_open(void *instance)
 {
-	proto_vmps_udp_t *inst = talloc_get_type_abort(instance, proto_vmps_udp_t);
+	proto_vmps_udp_t		*inst = talloc_get_type_abort(instance, proto_vmps_udp_t);
 
 	int				sockfd = 0;
 	uint16_t			port = inst->port;
@@ -252,7 +252,7 @@ static int mod_open(void *instance)
  */
 static int mod_fd(void const *instance)
 {
-	proto_vmps_udp_t *inst = talloc_get_type_abort(instance, proto_vmps_udp_t);
+	proto_vmps_udp_t const *inst = talloc_get_type_abort_const(instance, proto_vmps_udp_t);
 
 	return inst->sockfd;
 }