diff options
| author | Benjamin Otte <otte@redhat.com> | 2018-06-13 21:40:38 +0200 |
|---|---|---|
| committer | Mohammed Sadiq <sadiq@sadiqpk.org> | 2018-06-14 06:37:00 +0530 |
| commit | eefd2d6f104973d1461feee0b94dff8af991e145 (patch) | |
| tree | ceaa7521adc4deb452705db6bc8385125e979437 /gtk/gtkcomposetable.h | |
| parent | daf72e2e964b05b5c6ddeaa1f43a0966fd2ec98c (diff) | |
| download | gtk+-eefd2d6f104973d1461feee0b94dff8af991e145.tar.gz | |
imcontext: Make size arguments be gsize and not int
Otherwise gcc complains when we use these as arguments to g_new() on
32bit architectures with:
../gtk/gtkcomposetable.c: In function ‘gtk_compose_table_list_add_array’:
/usr/include/glib-2.0/glib/gmem.h:217:10: warning: argument 1 range [2147483648, 4294967295] exceeds maximum object size 2147483647 [-Walloc-size-larger-than=]
__p = g_##func##_n (__n, __s); \
~~~~^~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/glib-2.0/glib/gmem.h:279:42: note: in expansion of macro ‘_G_NEW’
#define g_new0(struct_type, n_structs) _G_NEW (struct_type, n_structs, malloc0)
^~~~~~
../gtk/gtkcomposetable.c:851:22: note: in expansion of macro ‘g_new0’
gtk_compose_seqs = g_new0 (guint16, length);
^~~~~~
/usr/include/glib-2.0/glib/gmem.h:96:10: note: in a call to allocation function ‘g_malloc0_n’ declared here
gpointer g_malloc0_n (gsize n_blocks,
^~~~~~~~~~~
Diffstat (limited to 'gtk/gtkcomposetable.h')
| -rw-r--r-- | gtk/gtkcomposetable.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/gtkcomposetable.h b/gtk/gtkcomposetable.h index f2e8e8de3d..05eae98d7f 100644 --- a/gtk/gtkcomposetable.h +++ b/gtk/gtkcomposetable.h @@ -29,24 +29,24 @@ typedef struct _GtkComposeTableCompact GtkComposeTableCompact; struct _GtkComposeTable { guint16 *data; - gint max_seq_len; - gint n_seqs; + gsize max_seq_len; + gsize n_seqs; guint32 id; }; struct _GtkComposeTableCompact { const guint16 *data; - gint max_seq_len; - gint n_index_size; - gint n_index_stride; + gsize max_seq_len; + gsize n_index_size; + gsize n_index_stride; }; GtkComposeTable * gtk_compose_table_new_with_file (const gchar *compose_file); GSList *gtk_compose_table_list_add_array (GSList *compose_tables, const guint16 *data, - gint max_seq_len, - gint n_seqs); + gsize max_seq_len, + gsize n_seqs); GSList *gtk_compose_table_list_add_file (GSList *compose_tables, const gchar *compose_file); |