edu4rdshl/gnome-shell
1
0
Fork 0
mirror of https://github.com/edu4rdshl/gnome-shell.git synced 2026-07-18 07:34:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

st/theme: Use glib auto free/ptr features

Browse source 
Use g_autofree and g_autoptr for managing memory in a smarter way.
This commit is contained in:
Marco Trevisan (Treviño) 2019-05-07 01:40:13 +02:00
parent 4961a0b277
commit 789539c674
1 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/st/st-theme.c
View file

@ -194,7 +194,7 @@ parse_stylesheet (GFile *file,
{
enum CRStatus status;
CRStyleSheet *stylesheet;
char *contents;
g_autofree char *contents = NULL;
gsize length;
if (file == NULL)
@ -207,14 +207,11 @@ parse_stylesheet (GFile *file,
length,
CR_UTF_8,
&stylesheet);
g_free (contents);
if (status != CR_OK)
{
char *uri = g_file_get_uri (file);
g_autofree char *uri = g_file_get_uri (file);
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Error parsing stylesheet '%s'; errcode:%d", uri, status);
g_free (uri);
return NULL;
}
@ -901,7 +898,7 @@ add_matched_properties (StTheme *a_this,
if (import_rule->sheet == NULL)
{
GFile *file = NULL;
g_autoptr (GFile) file = NULL;
if (import_rule->url->stryng && import_rule->url->stryng->str)
{
@ -923,9 +920,6 @@ add_matched_properties (StTheme *a_this,
*/
import_rule->sheet = (CRStyleSheet *) - 1;
}
if (file)
g_object_unref (file);
}
if (import_rule->sheet != (CRStyleSheet *) - 1)
@ -1071,20 +1065,18 @@ _st_theme_resolve_url (StTheme *theme,
CRStyleSheet *base_stylesheet,
const char *url)
{
char *scheme;
g_autofree char *scheme = NULL;
GFile *resource;
if ((scheme = g_uri_parse_scheme (url)))
{
g_free (scheme);
resource = g_file_new_for_uri (url);
}
else if (base_stylesheet != NULL)
{
GFile *base_file = NULL, *parent;
StyleSheetData *stylesheet_data = cr_stylesheet_get_app_data (base_stylesheet);
base_file = stylesheet_data->file;
GFile *base_file = stylesheet_data->file;
g_autoptr (GFile) parent = NULL;
/* This is an internal function, if we get here with
a bad @base_stylesheet we have a problem. */
@ -1092,8 +1084,6 @@ _st_theme_resolve_url (StTheme *theme,
parent = g_file_get_parent (base_file);
resource = g_file_resolve_relative_path (parent, url);
g_object_unref (parent);
}
else
{