luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-26 12:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

GDBusMessage: add some G_UNLIKELY on error paths

Browse Source 
More for documentation than anything else...
This commit is contained in:
Ryan Lortie 2014-07-09 11:19:58 -04:00
parent 636cd00c21
commit 5d0e295fb8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gdbusmessage.c
View File

@ -1346,7 +1346,7 @@ read_string (GMemoryBuffer *mbuf,
gchar *str; gchar *str;
const gchar *end_valid; const gchar *end_valid;
if (mbuf->pos + len >= mbuf->valid_len || mbuf->pos + len < mbuf->pos) if G_UNLIKELY (mbuf->pos + len >= mbuf->valid_len || mbuf->pos + len < mbuf->pos)
{ {
mbuf->pos = mbuf->valid_len; mbuf->pos = mbuf->valid_len;
/* G_GSIZE_FORMAT doesn't work with gettext, so we use %lu */ /* G_GSIZE_FORMAT doesn't work with gettext, so we use %lu */
@ -1362,7 +1362,7 @@ read_string (GMemoryBuffer *mbuf,
return NULL; return NULL;
} }
if (mbuf->data[mbuf->pos + len] != '\0') if G_UNLIKELY (mbuf->data[mbuf->pos + len] != '\0')
{ {
str = g_strndup (mbuf->data + mbuf->pos, len); str = g_strndup (mbuf->data + mbuf->pos, len);
g_set_error (error, g_set_error (error,
@ -1378,7 +1378,7 @@ read_string (GMemoryBuffer *mbuf,
str = mbuf->data + mbuf->pos; str = mbuf->data + mbuf->pos;
mbuf->pos += len + 1; mbuf->pos += len + 1;
if (!g_utf8_validate (str, -1, &end_valid)) if G_UNLIKELY (!g_utf8_validate (str, -1, &end_valid))
{ {
gint offset; gint offset;
gchar *valid_str; gchar *valid_str;
@ -1406,7 +1406,7 @@ read_bytes (GMemoryBuffer *mbuf,
{ {
gconstpointer result; gconstpointer result;
if (mbuf->pos + len > mbuf->valid_len || mbuf->pos + len < mbuf->pos) if G_UNLIKELY (mbuf->pos + len > mbuf->valid_len || mbuf->pos + len < mbuf->pos)
{ {
mbuf->pos = mbuf->valid_len; mbuf->pos = mbuf->valid_len;
/* G_GSIZE_FORMAT doesn't work with gettext, so we use %lu */ /* G_GSIZE_FORMAT doesn't work with gettext, so we use %lu */