summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfujiwarat <takao.fujiwara1@gmail.com>2016-01-29 12:44:49 +0900
committerfujiwarat <takao.fujiwara1@gmail.com>2016-01-29 12:44:49 +0900
commitd5bf50cbaf8901c4d32c212c5fea31419e1b4fb7 (patch)
tree84e30bdcd385da16fa96a82191fc08fc9faa8c55
parent7241f66b05344b0b7caf2f83a23aa248233a955a (diff)
downloadibus-d5bf50cbaf8901c4d32c212c5fea31419e1b4fb7.tar.gz
src: Change guint to guint16 in ibusenginesimple.c
IBusComposeTable and IBusComposeTableCompact use guint16 for the data. BUG=https://bugzilla.gnome.org/show_bug.cgi?id=721120 R=Shawn.P.Huang@gmail.com Review URL: https://codereview.appspot.com/282390043
-rw-r--r--src/ibusenginesimple.c14
-rw-r--r--src/ibusenginesimpleprivate.h4
2 files changed, 9 insertions, 9 deletions
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 2f949fa0..b8190c64 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -47,7 +47,7 @@
struct _IBusEngineSimplePrivate {
GSList *tables;
- guint compose_buffer[IBUS_MAX_COMPOSE_LEN + 1];
+ guint16 compose_buffer[IBUS_MAX_COMPOSE_LEN + 1];
gunichar tentative_match;
gint tentative_match_len;
@@ -284,7 +284,7 @@ check_hex (IBusEngineSimple *simple,
static int
compare_seq_index (const void *key, const void *value)
{
- const guint *keysyms = key;
+ const guint16 *keysyms = key;
const guint16 *seq = value;
if (keysyms[0] < seq[0])
@@ -298,7 +298,7 @@ static int
compare_seq (const void *key, const void *value)
{
int i = 0;
- const guint *keysyms = key;
+ const guint16 *keysyms = key;
const guint16 *seq = value;
while (keysyms[i]) {
@@ -380,7 +380,7 @@ check_table (IBusEngineSimple *simple,
gboolean
ibus_check_compact_table (const IBusComposeTableCompact *table,
- guint *compose_buffer,
+ guint16 *compose_buffer,
gint n_compose,
gboolean *compose_finish,
gunichar *output_char)
@@ -540,9 +540,9 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
}
gboolean
-ibus_check_algorithmically (const guint *compose_buffer,
- gint n_compose,
- gunichar *output_char)
+ibus_check_algorithmically (const guint16 *compose_buffer,
+ gint n_compose,
+ gunichar *output_char)
{
gint i;
diff --git a/src/ibusenginesimpleprivate.h b/src/ibusenginesimpleprivate.h
index ee6affc0..cac404b1 100644
--- a/src/ibusenginesimpleprivate.h
+++ b/src/ibusenginesimpleprivate.h
@@ -28,12 +28,12 @@ G_BEGIN_DECLS
extern const IBusComposeTableCompact ibus_compose_table_compact;
-gboolean ibus_check_algorithmically (const guint *compose_buffer,
+gboolean ibus_check_algorithmically (const guint16 *compose_buffer,
gint n_compose,
gunichar *output);
gboolean ibus_check_compact_table (const IBusComposeTableCompact
*table,
- guint *compose_buffer,
+ guint16 *compose_buffer,
gint n_compose,
gboolean *compose_finish,
gunichar *output_char);