Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

croco: Use g_string_free() return value #12630

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

croco: Use g_string_free() return value #12630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/st/croco/cr-additional-sel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,7 @@ cr_additional_sel_to_string (CRAdditionalSel const * a_this)
}

if (str_buf) {
result = (guchar *) str_buf->str;
g_string_free (str_buf, FALSE);
result = (guchar *) g_string_free (str_buf, FALSE);
str_buf = NULL;
}

Expand Down Expand Up @@ -422,8 +421,7 @@ cr_additional_sel_one_to_string (CRAdditionalSel const *a_this)
}

if (str_buf) {
result = (guchar *) str_buf->str;
g_string_free (str_buf, FALSE);
result = (guchar *) g_string_free (str_buf, FALSE);
str_buf = NULL;
}

Expand Down
3 changes: 1 addition & 2 deletions src/st/croco/cr-attr-sel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@ cr_attr_sel_to_string (CRAttrSel const * a_this)
}

if (str_buf) {
result = (guchar *) str_buf->str;
g_string_free (str_buf, FALSE);
result = (guchar *) g_string_free (str_buf, FALSE);
}

return result;
Expand Down
9 changes: 3 additions & 6 deletions src/st/croco/cr-declaration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,8 +539,7 @@ cr_declaration_to_string (CRDeclaration const * a_this, gulong a_indent)
}
}
if (stringue && stringue->str) {
result = stringue->str;
g_string_free (stringue, FALSE);
result = g_string_free (stringue, FALSE);
}
return result;

Expand Down Expand Up @@ -586,8 +585,7 @@ cr_declaration_list_to_string (CRDeclaration const * a_this, gulong a_indent)
break;
}
if (stringue && stringue->str) {
result = (guchar *) stringue->str;
g_string_free (stringue, FALSE);
result = (guchar *) g_string_free (stringue, FALSE);
}

return result;
Expand Down Expand Up @@ -639,8 +637,7 @@ cr_declaration_list_to_string2 (CRDeclaration const * a_this,
break;
}
if (stringue && stringue->str) {
result = (guchar *) stringue->str;
g_string_free (stringue, FALSE);
result = (guchar *) g_string_free (stringue, FALSE);
}

return result;
Expand Down
3 changes: 1 addition & 2 deletions src/st/croco/cr-fonts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,7 @@ cr_font_family_to_string (CRFontFamily const * a_this,
&stringue);

if (status == CR_OK && stringue) {
result = (guchar *) stringue->str;
g_string_free (stringue, FALSE);
result = (guchar *) g_string_free (stringue, FALSE);
stringue = NULL;

} else {
Expand Down
3 changes: 1 addition & 2 deletions src/st/croco/cr-parsing-location.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@ cr_parsing_location_to_string (CRParsingLocation const *a_this,
a_this->byte_offset) ;
}
if (result->len) {
str = result->str ;
g_string_free (result, FALSE) ;
str = g_string_free (result, FALSE) ;
} else {
g_string_free (result, TRUE) ;
}
Expand Down
3 changes: 1 addition & 2 deletions src/st/croco/cr-pseudo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,7 @@ cr_pseudo_to_string (CRPseudo const * a_this)
}

if (str_buf) {
result = (guchar *) str_buf->str;
g_string_free (str_buf, FALSE);
result = (guchar *) g_string_free (str_buf, FALSE);
str_buf = NULL;
}

Expand Down
3 changes: 1 addition & 2 deletions src/st/croco/cr-rgb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,7 @@ cr_rgb_to_string (CRRgb const * a_this)
}

if (str_buf) {
result = (guchar *) str_buf->str;
g_string_free (str_buf, FALSE);
result = (guchar *) g_string_free (str_buf, FALSE);
}

return result;
Expand Down
3 changes: 1 addition & 2 deletions src/st/croco/cr-selector.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,7 @@ cr_selector_to_string (CRSelector const * a_this)
}

if (str_buf) {
result = (guchar *) str_buf->str;
g_string_free (str_buf, FALSE);
result = (guchar *) g_string_free (str_buf, FALSE);
str_buf = NULL;
}

Expand Down
6 changes: 2 additions & 4 deletions src/st/croco/cr-simple-sel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,7 @@ cr_simple_sel_to_string (CRSimpleSel const * a_this)
}

if (str_buf) {
result = (guchar *) str_buf->str;
g_string_free (str_buf, FALSE);
result = (guchar *) g_string_free (str_buf, FALSE);
str_buf = NULL;
}

Expand Down Expand Up @@ -194,8 +193,7 @@ cr_simple_sel_one_to_string (CRSimpleSel const * a_this)
}

if (str_buf) {
result = (guchar *) str_buf->str;
g_string_free (str_buf, FALSE);
result = (guchar *) g_string_free (str_buf, FALSE);
str_buf = NULL;
}

Expand Down
24 changes: 7 additions & 17 deletions src/st/croco/cr-statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,12 +623,8 @@ cr_statement_ruleset_to_string (CRStatement const * a_this, glong a_indent)
cr_utils_dump_n_chars2 (' ', stringue, a_indent);
}
g_string_append (stringue, "}");
result = stringue->str;
result = g_string_free (stringue, FALSE);

if (stringue) {
g_string_free (stringue, FALSE);
stringue = NULL;
}
if (tmp_str) {
g_free (tmp_str);
tmp_str = NULL;
Expand Down Expand Up @@ -679,8 +675,7 @@ cr_statement_font_face_rule_to_string (CRStatement const * a_this,
g_string_append (stringue, "\n}");
}
if (stringue) {
result = stringue->str ;
g_string_free (stringue, FALSE) ;
result = g_string_free (stringue, FALSE);
stringue = NULL ;
}
return result ;
Expand Down Expand Up @@ -726,8 +721,7 @@ cr_statement_charset_to_string (CRStatement const *a_this,
}
}
if (stringue) {
str = stringue->str ;
g_string_free (stringue, FALSE) ;
str = g_string_free (stringue, FALSE);
}
return str ;
}
Expand Down Expand Up @@ -780,8 +774,7 @@ cr_statement_at_page_rule_to_string (CRStatement const *a_this,
}
g_string_append (stringue, "\n}\n");
}
result = stringue->str ;
g_string_free (stringue, FALSE) ;
result = g_string_free (stringue, FALSE) ;
stringue = NULL ;
return result ;
}
Expand Down Expand Up @@ -842,8 +835,7 @@ cr_statement_media_rule_to_string (CRStatement const *a_this,
g_string_append (stringue, "\n}");
}
if (stringue) {
str = stringue->str ;
g_string_free (stringue, FALSE) ;
str = g_string_free (stringue, FALSE) ;
}
return str ;
}
Expand Down Expand Up @@ -905,8 +897,7 @@ cr_statement_import_rule_to_string (CRStatement const *a_this,
g_string_append (stringue, " ;");
}
if (stringue) {
str = stringue->str ;
g_string_free (stringue, FALSE) ;
str = g_string_free (stringue, FALSE) ;
stringue = NULL ;
}
return str ;
Expand Down Expand Up @@ -2565,8 +2556,7 @@ cr_statement_list_to_string (CRStatement const *a_this, gulong a_indent)
str = NULL ;
}
}
str = stringue->str ;
g_string_free (stringue, FALSE) ;
str = g_string_free (stringue, FALSE) ;
return str ;
}

Expand Down
3 changes: 1 addition & 2 deletions src/st/croco/cr-stylesheet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ cr_stylesheet_to_string (CRStyleSheet const *a_this)
}
}
if (stringue) {
str = stringue->str ;
g_string_free (stringue, FALSE) ;
str = g_string_free (stringue, FALSE) ;
stringue = NULL ;
}
return str ;
Expand Down
6 changes: 2 additions & 4 deletions src/st/croco/cr-term.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,7 @@ cr_term_to_string (CRTerm const * a_this)
}

if (str_buf) {
result =(guchar *) str_buf->str;
g_string_free (str_buf, FALSE);
result = (guchar *) g_string_free (str_buf, FALSE);
str_buf = NULL;
}

Expand Down Expand Up @@ -659,8 +658,7 @@ cr_term_one_to_string (CRTerm const * a_this)
}

if (str_buf) {
result = (guchar *) str_buf->str;
g_string_free (str_buf, FALSE);
result = (guchar *) g_string_free (str_buf, FALSE);
str_buf = NULL;
}

Expand Down
Loading