[1/2] Removed only written system_config_file field

Submitted by Frediano Ziglio on July 26, 2019, 2:28 p.m.

Details

Message ID 20190726142836.10982-1-fziglio@redhat.com
State Accepted
Commit 327e61044b5141b3d8efad8ded001c7505f29f63
Headers show
Series "Series without cover letter" ( rev: 1 ) in Spice

Not browsing as part of any series.

Commit Message

Frediano Ziglio July 26, 2019, 2:28 p.m.
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
---
 src/options.c | 3 +--
 src/options.h | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/options.c b/src/options.c
index c7c75a8..a6c7b9e 100644
--- a/src/options.c
+++ b/src/options.c
@@ -80,7 +80,6 @@  void options_free(options_t *options)
     str_replace(&options->on_connect, NULL);
     str_replace(&options->on_disconnect, NULL);
     str_replace(&options->user_config_file, NULL);
-    str_replace(&options->system_config_file, NULL);
 }
 
 
@@ -353,7 +352,7 @@  static void options_from_config(options_t *options)
         systemkey = g_key_file_new();
         if (!g_key_file_load_from_dirs(systemkey, "x11spice/x11spice.conf",
                                        (const char **) g_get_system_config_dirs(),
-                                       &options->system_config_file, G_KEY_FILE_NONE, NULL)) {
+                                       NULL, G_KEY_FILE_NONE, NULL)) {
             g_key_file_free(systemkey);
             systemkey = NULL;
         }
diff --git a/src/options.h b/src/options.h
index e7cdece..94341e8 100644
--- a/src/options.h
+++ b/src/options.h
@@ -65,7 +65,6 @@  typedef struct {
 
     /* file names of config files */
     char *user_config_file;
-    char *system_config_file;
 } options_t;
 
 

Comments

On 7/26/19 9:28 AM, Frediano Ziglio wrote:
> Signed-off-by: Frediano Ziglio <fziglio@redhat.com>

For series:
Acked-by: Jeremy White <jwhite@codeweavers.com>

> ---
>   src/options.c | 3 +--
>   src/options.h | 1 -
>   2 files changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/src/options.c b/src/options.c
> index c7c75a8..a6c7b9e 100644
> --- a/src/options.c
> +++ b/src/options.c
> @@ -80,7 +80,6 @@ void options_free(options_t *options)
>       str_replace(&options->on_connect, NULL);
>       str_replace(&options->on_disconnect, NULL);
>       str_replace(&options->user_config_file, NULL);
> -    str_replace(&options->system_config_file, NULL);
>   }
>   
>   
> @@ -353,7 +352,7 @@ static void options_from_config(options_t *options)
>           systemkey = g_key_file_new();
>           if (!g_key_file_load_from_dirs(systemkey, "x11spice/x11spice.conf",
>                                          (const char **) g_get_system_config_dirs(),
> -                                       &options->system_config_file, G_KEY_FILE_NONE, NULL)) {
> +                                       NULL, G_KEY_FILE_NONE, NULL)) {
>               g_key_file_free(systemkey);
>               systemkey = NULL;
>           }
> diff --git a/src/options.h b/src/options.h
> index e7cdece..94341e8 100644
> --- a/src/options.h
> +++ b/src/options.h
> @@ -65,7 +65,6 @@ typedef struct {
>   
>       /* file names of config files */
>       char *user_config_file;
> -    char *system_config_file;
>   } options_t;
>   
>   
>