nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not extra check g_free for null

Browse Source
This commit is contained in:
Benedikt Heine 2017-10-08 18:09:44 +02:00
parent bc3c6466ca
commit 01197584ae
4 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/notification.c
View File

@ -176,12 +176,8 @@ void notification_free(notification *n)
g_free(n->msg); g_free(n->msg);
g_free(n->dbus_client); g_free(n->dbus_client);
g_free(n->category); g_free(n->category);
g_free(n->text_to_render);
if (n->text_to_render) g_free(n->urls);
g_free(n->text_to_render);
if (n->urls)
g_free(n->urls);
if (n->actions) { if (n->actions) {
g_strfreev(n->actions->actions); g_strfreev(n->actions->actions);
@ -642,10 +638,8 @@ bool notification_replace_by_id(notification *new)
void notification_update_text_to_render(notification *n) void notification_update_text_to_render(notification *n)
{ {
if (n->text_to_render) { g_free(n->text_to_render);
g_free(n->text_to_render); n->text_to_render = NULL;
n->text_to_render = NULL;
}
char *buf = NULL; char *buf = NULL;

6
src/option_parser.c
View File

@ -248,8 +248,7 @@ int load_ini_file(FILE *fp)
*end = '\0'; *end = '\0';
if (current_section) g_free(current_section);
g_free(current_section);
current_section = (g_strdup(start + 1)); current_section = (g_strdup(start + 1));
new_section(current_section); new_section(current_section);
continue; continue;
@ -296,8 +295,7 @@ int load_ini_file(FILE *fp)
add_entry(current_section, key, value); add_entry(current_section, key, value);
} }
free(line); free(line);
if (current_section) g_free(current_section);
g_free(current_section);
return 0; return 0;
} }

3
src/rules.c
View File

@ -23,8 +23,7 @@ void rule_apply(rule_t *r, notification *n)
if (r->markup != MARKUP_NULL) if (r->markup != MARKUP_NULL)
n->markup = r->markup; n->markup = r->markup;
if (r->new_icon) { if (r->new_icon) {
if(n->icon) g_free(n->icon);
g_free(n->icon);
n->icon = g_strdup(r->new_icon); n->icon = g_strdup(r->new_icon);
n->icon_overridden = true; n->icon_overridden = true;
} }

3
src/settings.c
View File

@ -64,8 +64,7 @@ static int ini_get_urgency(const char *section, const char *key, const int def)
"unknown urgency: %s, ignoring\n", "unknown urgency: %s, ignoring\n",
urg); urg);
} }
if (urg) g_free(urg);
g_free(urg);
return ret; return ret;
} }