luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-02 13:53:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

GString: Avoid some repeated parameter checking

Browse Source 
Many of the append and prepend variants are just thin wrappers
around another one. Remove parameter checking in the wrapper
for these cases. The wrapped function is checking them anyway.
This commit is contained in:
Matthias Clasen 2015-09-07 10:35:13 -04:00
parent 03db1f455b
commit 23229bfd0c
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glib/gstring.c
View File

@ -445,7 +445,7 @@ g_string_insert_len (GString *string,
* since ">=" and "<=" are only valid when val really is a substring. * since ">=" and "<=" are only valid when val really is a substring.
* In practice, it will work on modern archs. * In practice, it will work on modern archs.
*/ */
if (val >= string->str && val <= string->str + string->len) if (G_UNLIKELY (val >= string->str && val <= string->str + string->len))
{ {
gsize offset = val - string->str; gsize offset = val - string->str;
gsize precount = 0; gsize precount = 0;
@ -593,9 +593,6 @@ GString *
g_string_append (GString *string, g_string_append (GString *string,
const gchar *val) const gchar *val)
{ {
g_return_val_if_fail (string != NULL, NULL);
g_return_val_if_fail (val != NULL, string);
return g_string_insert_len (string, -1, val, -1); return g_string_insert_len (string, -1, val, -1);
} }
@ -620,9 +617,6 @@ g_string_append_len (GString *string,
const gchar *val, const gchar *val,
gssize len) gssize len)
{ {
g_return_val_if_fail (string != NULL, NULL);
g_return_val_if_fail (len == 0 || val != NULL, string);
return g_string_insert_len (string, -1, val, len); return g_string_insert_len (string, -1, val, len);
} }
@ -679,9 +673,6 @@ GString *
g_string_prepend (GString *string, g_string_prepend (GString *string,
const gchar *val) const gchar *val)
{ {
g_return_val_if_fail (string != NULL, NULL);
g_return_val_if_fail (val != NULL, string);
return g_string_insert_len (string, 0, val, -1); return g_string_insert_len (string, 0, val, -1);
} }
@ -706,9 +697,6 @@ g_string_prepend_len (GString *string,
const gchar *val, const gchar *val,
gssize len) gssize len)
{ {
g_return_val_if_fail (string != NULL, NULL);
g_return_val_if_fail (val != NULL, string);
return g_string_insert_len (string, 0, val, len); return g_string_insert_len (string, 0, val, len);
} }
@ -766,12 +754,6 @@ g_string_insert (GString *string,
gssize pos, gssize pos,
const gchar *val) const gchar *val)
{ {
g_return_val_if_fail (string != NULL, NULL);
g_return_val_if_fail (val != NULL, string);
if (pos >= 0)
g_return_val_if_fail (pos <= string->len, string);
return g_string_insert_len (string, pos, val, -1); return g_string_insert_len (string, pos, val, -1);
} }