diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2012-03-07 12:54:04 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2012-07-05 23:27:35 -0400 |
| commit | 2a87010831db5d4c18905103e9e7d804546552bf (patch) | |
| tree | cfc05eb99f6ed79040694ae10964f3e9b65324d0 /gobject/gvaluecollector.h | |
| parent | ab4cc22ba5d7a1a9ee72eaccd171ac1fc82bfb5c (diff) | |
| download | glib-2a87010831db5d4c18905103e9e7d804546552bf.tar.gz | |
Constify collect and lcopy strings in GTypeValueTable
This avoids warnings when creating idiomatic value tables, like:
static const GTypeValueTable _clutter_shader_float_value_table = {
clutter_value_init_shader_float,
clutter_value_free_shader_float,
clutter_value_copy_shader_float,
clutter_value_peek_pointer,
"ip",
clutter_value_collect_shader_float,
"pp",
clutter_value_lcopy_shader_float
};
Because the strings are literals. And, really: nobody should be using
allocated values for the collection and lcopy strings.
https://bugzilla.gnome.org/show_bug.cgi?id=671545
Diffstat (limited to 'gobject/gvaluecollector.h')
| -rw-r--r-- | gobject/gvaluecollector.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gobject/gvaluecollector.h b/gobject/gvaluecollector.h index 6d5190e07..05a436aaa 100644 --- a/gobject/gvaluecollector.h +++ b/gobject/gvaluecollector.h @@ -92,7 +92,7 @@ G_STMT_START { \ GValue *_val = (value); \ guint _flags = (flags); \ GTypeValueTable *_vtab = g_type_value_table_peek (_value_type); \ - gchar *_collect_format = _vtab->collect_format; \ + const gchar *_collect_format = _vtab->collect_format; \ GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, }; \ guint _n_values = 0; \ \ @@ -161,7 +161,7 @@ G_STMT_START { \ #define G_VALUE_COLLECT_SKIP(_value_type, var_args) \ G_STMT_START { \ GTypeValueTable *_vtable = g_type_value_table_peek (_value_type); \ - gchar *_collect_format = _vtable->collect_format; \ + const gchar *_collect_format = _vtable->collect_format; \ \ while (*_collect_format) \ { \ @@ -207,7 +207,7 @@ G_STMT_START { \ guint _flags = (flags); \ GType _value_type = G_VALUE_TYPE (_value); \ GTypeValueTable *_vtable = g_type_value_table_peek (_value_type); \ - gchar *_lcopy_format = _vtable->lcopy_format; \ + const gchar *_lcopy_format = _vtable->lcopy_format; \ GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, }; \ guint _n_values = 0; \ \ |