From 9bd635d7e6ef1823c84430d9314b3bfe18ac30c6 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Sat, 17 Jul 2021 23:13:01 +0200 Subject: accounts: get rid of guard around free --- src/config/accounts.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'src/config/accounts.c') diff --git a/src/config/accounts.c b/src/config/accounts.c index 6018cfff..83934012 100644 --- a/src/config/accounts.c +++ b/src/config/accounts.c @@ -908,9 +908,7 @@ accounts_get_last_presence(const char* const account_name) result = RESOURCE_ONLINE; } - if (setting) { - g_free(setting); - } + g_free(setting); return result; } @@ -939,14 +937,11 @@ accounts_get_login_presence(const char* const account_name) } else if (strcmp(setting, "last") == 0) { result = accounts_get_last_presence(account_name); } else { - log_warning("Error reading presence.login for account: '%s', value: '%s', defaulting to 'online'", - account_name, setting); + log_warning("Error reading presence.login for account: '%s', value: '%s', defaulting to 'online'", account_name, setting); result = RESOURCE_ONLINE; } - if (setting) { - g_free(setting); - } + g_free(setting); return result; } @@ -955,13 +950,12 @@ accounts_get_login_status(const char* const account_name) { gchar* setting = g_key_file_get_string(accounts, account_name, "presence.login", NULL); gchar* status = NULL; + if (g_strcmp0(setting, "last") == 0) { status = accounts_get_last_status(account_name); } - if (setting) { - g_free(setting); - } + g_free(setting); return status; } -- cgit 1.4.1-2-gfad0 class='right' method='get' action='/akspecs/ranger/log/doc/ranger.1'>
path: root/doc/ranger.1
blob: d31984fea558fbab3c1cbc0f1fc00190582cdd45 (plain) (tree) 
dd91e084 ^


af9b8b3b ^

dd91e084 ^
























































































































































































1
2

3

4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187