X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fsleep-config.c;h=867e4edaa2e79978b963594e30feee6deff594e5;hb=30d7c9c472bd7be1b6a09d3bd5afd939988de990;hp=b9b6643066cc86773e83dbf2a5fde702f6ae4c10;hpb=c8a202b7d47f9d6bba3100a208abdadfc383499e;p=elogind.git diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c index b9b664306..867e4edaa 100644 --- a/src/shared/sleep-config.c +++ b/src/shared/sleep-config.c @@ -31,6 +31,7 @@ #define USE(x, y) do{ (x) = (y); (y) = NULL; } while(0) int parse_sleep_config(const char *verb, char ***_modes, char ***_states) { + _cleanup_strv_free_ char **suspend_mode = NULL, **suspend_state = NULL, **hibernate_mode = NULL, **hibernate_state = NULL, @@ -44,10 +45,11 @@ int parse_sleep_config(const char *verb, char ***_modes, char ***_states) { { "Sleep", "HibernateState", config_parse_strv, 0, &hibernate_state }, { "Sleep", "HybridSleepMode", config_parse_strv, 0, &hybrid_mode }, { "Sleep", "HybridSleepState", config_parse_strv, 0, &hybrid_state }, - {}}; + {} + }; int r; - FILE _cleanup_fclose_ *f; + _cleanup_fclose_ FILE *f; f = fopen(PKGSYSCONFDIR "/sleep.conf", "re"); if (!f) @@ -220,8 +222,8 @@ static int hibernation_partition_size(size_t *size, size_t *used) { static bool enough_memory_for_hibernation(void) { _cleanup_free_ char *active = NULL; - unsigned long long act; - size_t size, used; + unsigned long long act = 0; + size_t size = 0, used = 0; int r; r = hibernation_partition_size(&size, &used);