[PATCH] iface-modem: remove unnecessary error check

[Aleksander Morgado]

On 07/08/17 23:05, Ben Chan wrote:
> This patch removes an unnecessary error check in the
> update_unlock_retries() where the error is never set.

Pushed to git master, mm-1-6, mm-1-4 and mm-1-2, thanks!

> ---
>  src/mm-iface-modem.c | 18 ++++++------------
>  1 file changed, 6 insertions(+), 12 deletions(-)
> 
> diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c
> index ec453a8f..c025b5c5 100644
> --- a/src/mm-iface-modem.c
> +++ b/src/mm-iface-modem.c
> @@ -2931,7 +2931,6 @@ update_unlock_retries (MMIfaceModem *self,
>                         MMUnlockRetries *unlock_retries)
>  {
>      MmGdbusModem *skeleton = NULL;
> -    GError *error = NULL;
>      GVariant *previous_dictionary;
>      MMUnlockRetries *previous_unlock_retries;
>  
> @@ -2944,18 +2943,13 @@ update_unlock_retries (MMIfaceModem *self,
>      previous_dictionary = mm_gdbus_modem_get_unlock_retries (skeleton);
>      previous_unlock_retries = mm_unlock_retries_new_from_dictionary (previous_dictionary);
>  
> -    if (error) {
> -        mm_warn ("Couldn't build previous unlock retries: '%s'", error->message);
> -        g_error_free (error);
> -    } else {
> -        /* If they are different, update */
> -        if (!mm_unlock_retries_cmp (unlock_retries, previous_unlock_retries)) {
> -            GVariant *new_dictionary;
> +    /* If they are different, update */
> +    if (!mm_unlock_retries_cmp (unlock_retries, previous_unlock_retries)) {
> +        GVariant *new_dictionary;
>  
> -            new_dictionary = mm_unlock_retries_get_dictionary (unlock_retries);
> -            mm_gdbus_modem_set_unlock_retries (skeleton, new_dictionary);
> -            g_variant_unref (new_dictionary);
> -        }
> +        new_dictionary = mm_unlock_retries_get_dictionary (unlock_retries);
> +        mm_gdbus_modem_set_unlock_retries (skeleton, new_dictionary);
> +        g_variant_unref (new_dictionary);
>      }
>  
>      g_object_unref (previous_unlock_retries);
> 


-- 
Aleksander
https://aleksander.es