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

Don't do an extra strlen when g_variant_get_string() returns it already

Browse Source
This commit is contained in:
Christian Persch 2010-06-06 16:32:04 -04:00 committed by Matthias Clasen
parent 2aca3b506a
commit 87ee5f3641
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gio/gdbusmessage.c
View File

@ -1331,8 +1331,7 @@ g_dbus_message_new_from_blob (guchar *blob,
const gchar *signature_str; const gchar *signature_str;
gsize signature_str_len; gsize signature_str_len;
signature_str = g_variant_get_string (signature, NULL); signature_str = g_variant_get_string (signature, &signature_str_len);
signature_str_len = strlen (signature_str);
/* signature but no body */ /* signature but no body */
if (message_body_len == 0 && signature_str_len > 0) if (message_body_len == 0 && signature_str_len > 0)
@ -1531,9 +1530,8 @@ append_value_to_blob (GVariant *value,
padding_added = ensure_output_padding (mos, dos, 4); padding_added = ensure_output_padding (mos, dos, 4);
if (value != NULL) if (value != NULL)
{ {
const gchar *v = g_variant_get_string (value, NULL);
gsize len; gsize len;
len = strlen (v); const gchar *v = g_variant_get_string (value, &len);
g_data_output_stream_put_uint32 (dos, len, NULL, NULL); g_data_output_stream_put_uint32 (dos, len, NULL, NULL);
g_data_output_stream_put_string (dos, v, NULL, NULL); g_data_output_stream_put_string (dos, v, NULL, NULL);
g_data_output_stream_put_byte (dos, '\0', NULL, NULL); g_data_output_stream_put_byte (dos, '\0', NULL, NULL);
@ -1545,9 +1543,8 @@ append_value_to_blob (GVariant *value,
if (value != NULL) if (value != NULL)
{ {
/* TODO: validate object path */ /* TODO: validate object path */
const gchar *v = g_variant_get_string (value, NULL);
gsize len; gsize len;
len = strlen (v); const gchar *v = g_variant_get_string (value, &len);
g_data_output_stream_put_uint32 (dos, len, NULL, NULL); g_data_output_stream_put_uint32 (dos, len, NULL, NULL);
g_data_output_stream_put_string (dos, v, NULL, NULL); g_data_output_stream_put_string (dos, v, NULL, NULL);
g_data_output_stream_put_byte (dos, '\0', NULL, NULL); g_data_output_stream_put_byte (dos, '\0', NULL, NULL);
@ -1558,9 +1555,8 @@ append_value_to_blob (GVariant *value,
if (value != NULL) if (value != NULL)
{ {
/* TODO: validate signature (including max len being 255) */ /* TODO: validate signature (including max len being 255) */
const gchar *v = g_variant_get_string (value, NULL);
gsize len; gsize len;
len = strlen (v); const gchar *v = g_variant_get_string (value, &len);
g_data_output_stream_put_byte (dos, len, NULL, NULL); g_data_output_stream_put_byte (dos, len, NULL, NULL);
g_data_output_stream_put_string (dos, v, NULL, NULL); g_data_output_stream_put_string (dos, v, NULL, NULL);
g_data_output_stream_put_byte (dos, '\0', NULL, NULL); g_data_output_stream_put_byte (dos, '\0', NULL, NULL);