mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-08 10:26:16 +01:00
Merge branch 'stringcopyrevert' into 'master'
gvalue: Do copy non-interned strings Closes #2141 See merge request GNOME/glib!1545
This commit is contained in:
commit
d1ec0466dd
@ -171,7 +171,8 @@ void g_value_register_transform_func (GType src_type,
|
||||
*
|
||||
* If passed to G_VALUE_COLLECT(), allocated data won't be copied
|
||||
* but used verbatim. This does not affect ref-counted types like
|
||||
* objects.
|
||||
* objects. This does not affect usage of g_value_copy(), the data will
|
||||
* be copied if it is not ref-counted.
|
||||
*/
|
||||
#define G_VALUE_NOCOPY_CONTENTS (1 << 27)
|
||||
|
||||
|
@ -264,7 +264,7 @@ static void
|
||||
value_copy_string (const GValue *src_value,
|
||||
GValue *dest_value)
|
||||
{
|
||||
if (src_value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS)
|
||||
if (src_value->data[1].v_uint & G_VALUE_INTERNED_STRING)
|
||||
{
|
||||
dest_value->data[0].v_pointer = src_value->data[0].v_pointer;
|
||||
dest_value->data[1].v_uint = src_value->data[1].v_uint;
|
||||
@ -272,7 +272,7 @@ value_copy_string (const GValue *src_value,
|
||||
else
|
||||
{
|
||||
dest_value->data[0].v_pointer = g_strdup (src_value->data[0].v_pointer);
|
||||
dest_value->data[1].v_uint = src_value->data[1].v_uint;
|
||||
/* Don't copy over *any* flags, we're restarting from scratch */
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -148,11 +148,11 @@ test_value_string (void)
|
||||
g_assert_cmpstr (str2, ==, static1);
|
||||
g_free (str2);
|
||||
|
||||
/* Copying a static string gvalue should *not* copy the contents */
|
||||
/* Copying a static string gvalue should *actually* copy the contents */
|
||||
g_value_init (©, G_TYPE_STRING);
|
||||
g_value_copy (&value, ©);
|
||||
copystr = g_value_get_string (©);
|
||||
g_assert_true (copystr == static1);
|
||||
g_assert_true (copystr != static1);
|
||||
g_value_unset (©);
|
||||
|
||||
/* Setting a new string should change the contents */
|
||||
|
Loading…
Reference in New Issue
Block a user