Merge branch 'maint'

This commit is contained in:
Christopher Lam 2023-02-26 13:51:33 +08:00
commit 89e2bef427
4 changed files with 8 additions and 15 deletions

View File

@ -1336,8 +1336,7 @@ loan_rep_prep( GtkAssistant *assistant, gpointer user_data )
str = g_string_sized_new( 64 );
loan_get_pmt_formula( ldd, str);
ldd->ld.repAmount = str->str;
g_string_free( str, FALSE );
ldd->ld.repAmount = g_string_free (str, false);
if ( ldd->ld.repMemo )
gtk_entry_set_text( ldd->repTxnName, ldd->ld.repMemo );

View File

@ -769,9 +769,7 @@ gnc_html_encode_string(const char * str)
pos++;
}
ptr = encoded->str;
g_string_free (encoded, FALSE);
ptr = g_string_free (encoded, FALSE);
return (char *)ptr;
}
@ -819,8 +817,7 @@ gnc_html_decode_string(const char * str)
}
ptr++;
}
ptr = decoded->str;
g_string_free (decoded, FALSE);
ptr = g_string_free (decoded, FALSE);
return (char *)ptr;
}
@ -851,8 +848,7 @@ gnc_html_unescape_newlines(const gchar * in)
}
g_string_append_c(rv, 0);
cstr = rv->str;
g_string_free(rv, FALSE);
cstr = g_string_free (rv, FALSE);
return cstr;
}
@ -875,8 +871,7 @@ gnc_html_escape_newlines(const gchar * in)
}
}
g_string_append_c(escaped, 0);
out = escaped->str;
g_string_free(escaped, FALSE);
out = g_string_free (escaped, FALSE);
return out;
}

View File

@ -152,8 +152,7 @@ gnc_getline (gchar **line, FILE *file)
}
len = gs->len;
*line = gs->str;
g_string_free(gs, FALSE);
*line = g_string_free (gs, FALSE);
return len;
}

View File

@ -107,8 +107,8 @@ gnc_module_system_search_dirs(void)
case G_SEARCHPATH_SEPARATOR:
if (!escchar)
{
list = g_list_append(list, token->str);
g_string_free(token, TRUE);
char *token_str = g_string_free (token, FALSE);
list = g_list_append (list, token_str);
token = g_string_new(NULL);
}
else