[PATCH] network: use L_AUTO_FREE_VAR

[PATCH] network: use L_AUTO_FREE_VAR

[Marc-Antoine Perennou]

[-- Attachment #1: Type: text/plain, Size: 791 bytes --]

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
---
 src/network.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/network.c b/src/network.c
index 9e858663..0eb3687e 100644
--- a/src/network.c
+++ b/src/network.c
@@ -380,10 +380,10 @@ static int network_load_psk(struct network *network, bool need_passphrase)
 	size_t psk_len;
 	uint8_t *psk = l_settings_get_bytes(network->settings, "Security",
 						"PreSharedKey", &psk_len);
-	_auto_(l_free) char *passphrase =
+	L_AUTO_FREE_VAR(char *, passphrase) =
 			l_settings_get_string(network->settings,
 						"Security", "Passphrase");
-	_auto_(l_free) char *path =
+	L_AUTO_FREE_VAR(char *, path) =
 		storage_get_network_file_path(security, ssid);
 	int r;
 
-- 
2.30.0

Re: [PATCH] network: use L_AUTO_FREE_VAR

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 1186 bytes --]

Hi Marc-Antoine,

On 5/14/21 11:36 AM, Marc-Antoine Perennou wrote:
> Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
> ---
>   src/network.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/network.c b/src/network.c
> index 9e858663..0eb3687e 100644
> --- a/src/network.c
> +++ b/src/network.c
> @@ -380,10 +380,10 @@ static int network_load_psk(struct network *network, bool need_passphrase)
>   	size_t psk_len;
>   	uint8_t *psk = l_settings_get_bytes(network->settings, "Security",
>   						"PreSharedKey", &psk_len);
> -	_auto_(l_free) char *passphrase =
> +	L_AUTO_FREE_VAR(char *, passphrase) =
>   			l_settings_get_string(network->settings,
>   						"Security", "Passphrase");
> -	_auto_(l_free) char *path =
> +	L_AUTO_FREE_VAR(char *, path) =
>   		storage_get_network_file_path(security, ssid);
>   	int r;
>   
> 

Was this supposed to be part of a different set?  Can you resend the entire 
series, it isn't quite clear to me where you're going with this?

I would guess your intent is to use _auto_ with destructors only and fall back 
to L_AUTO_FREE_VAR for l_free?

Regards,
-Denis