From 39317c775719ec598314cba528e9905cb43d6dd8 Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Fri, 23 Aug 2019 22:10:25 +0200
Subject: [PATCH] mesh: avoid 'template' as argument name

---
 src/mesh/mesh_access.c | 16 ++++++++--------
 src/mesh/mesh_access.h |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/mesh/mesh_access.c b/src/mesh/mesh_access.c
index 78b176eb0..8665dfaf5 100644
--- a/src/mesh/mesh_access.c
+++ b/src/mesh/mesh_access.c
@@ -669,15 +669,15 @@ void mesh_access_network_add_model_identifier(mesh_network_pdu_t * pdu, uint32_t
 
 // access message template
 
-mesh_network_pdu_t * mesh_access_setup_unsegmented_message(const mesh_access_message_t *template, ...){
-    mesh_network_pdu_t * network_pdu = mesh_access_network_init(template->opcode);
+mesh_network_pdu_t * mesh_access_setup_unsegmented_message(const mesh_access_message_t *message_template, ...){
+    mesh_network_pdu_t * network_pdu = mesh_access_network_init(message_template->opcode);
     if (!network_pdu) return NULL;
 
     va_list argptr;
-    va_start(argptr, template);
+    va_start(argptr, message_template);
 
     // add params
-    const char * format = template->format;
+    const char * format = message_template->format;
     uint16_t word;
     uint32_t longword;
     while (*format){
@@ -714,15 +714,15 @@ mesh_network_pdu_t * mesh_access_setup_unsegmented_message(const mesh_access_mes
     return network_pdu;
 }
 
-mesh_transport_pdu_t * mesh_access_setup_segmented_message(const mesh_access_message_t *template, ...){
-    mesh_transport_pdu_t * transport_pdu = mesh_access_transport_init(template->opcode);
+mesh_transport_pdu_t * mesh_access_setup_segmented_message(const mesh_access_message_t *message_template, ...){
+    mesh_transport_pdu_t * transport_pdu = mesh_access_transport_init(message_template->opcode);
     if (!transport_pdu) return NULL;
 
     va_list argptr;
-    va_start(argptr, template);
+    va_start(argptr, message_template);
 
     // add params
-    const char * format = template->format;
+    const char * format = message_template->format;
     uint16_t word;
     uint32_t longword;
     while (*format){
diff --git a/src/mesh/mesh_access.h b/src/mesh/mesh_access.h
index 96ecacf8d..c5f45d474 100644
--- a/src/mesh/mesh_access.h
+++ b/src/mesh/mesh_access.h
@@ -254,8 +254,8 @@ void mesh_access_network_add_uint32(mesh_network_pdu_t * pdu, uint16_t value);
 void mesh_access_network_add_model_identifier(mesh_network_pdu_t * pdu, uint32_t model_identifier);
 
 // message builder using template
-mesh_network_pdu_t * mesh_access_setup_unsegmented_message(const mesh_access_message_t *template, ...);
-mesh_transport_pdu_t * mesh_access_setup_segmented_message(const mesh_access_message_t *template, ...);
+mesh_network_pdu_t * mesh_access_setup_unsegmented_message(const mesh_access_message_t *message_template, ...);
+mesh_transport_pdu_t * mesh_access_setup_segmented_message(const mesh_access_message_t *message_template, ...);
 
 #ifdef __cplusplus
 } /* end of extern "C" */