2019-07-04 07:16:30

by Stotland, Inga

Subject: [PATCH BlueZ] mesh: Remove redundant initialization

This fixes a case where a variable was initialized twice.
---
mesh/cfgmod-server.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c
index 634ac006b..bb78cead6 100644
--- a/mesh/cfgmod-server.c
+++ b/mesh/cfgmod-server.c
@@ -742,7 +742,7 @@ static bool cfg_srv_pkt(uint16_t src, uint32_t dst,
uint8_t ttl, const void *user_data)
{
struct mesh_node *node = (struct mesh_node *) user_data;
- struct mesh_net *net = node_get_net(node);
+ struct mesh_net *net;
const uint8_t *pkt = data;
struct timeval time_now;
uint32_t opcode, tmp32;
--
2.21.0

2019-07-04 18:16:49

by Gix, Brian

Subject: Re: [PATCH BlueZ] mesh: Remove redundant initialization

Applied

On Thu, 2019-07-04 at 00:15 -0700, Inga Stotland wrote:
> This fixes a case where a variable was initialized twice.
> ---
> mesh/cfgmod-server.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c
> index 634ac006b..bb78cead6 100644
> --- a/mesh/cfgmod-server.c
> +++ b/mesh/cfgmod-server.c
> @@ -742,7 +742,7 @@ static bool cfg_srv_pkt(uint16_t src, uint32_t
> dst,
> uint8_t ttl, const void *user_data)
> {
> struct mesh_node *node = (struct mesh_node *) user_data;
> - struct mesh_net *net = node_get_net(node);
> + struct mesh_net *net;
> const uint8_t *pkt = data;
> struct timeval time_now;
> uint32_t opcode, tmp32;