nacl/libchewing: Remove the workarounds for chewing_set_selKey.

google · Jan 7, 2014 · 07816c5 · 07816c5
1 parent e1a4442
commit 07816c5
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/nacl/libchewing/nacl.cc b/src/nacl/libchewing/nacl.cc
@@ -297,13 +297,11 @@ void *chewing_init_context(void *arg) {
   chewing_set_maxChiSymbolLen(ctx, 32);
   chewing_set_addPhraseDirection(ctx, 1);
   chewing_set_spaceAsSelection(ctx, 1);
-  // chewing_set_selKey does not really take the len arg and takes a hard-coded
-  // value for memcpy size. How amazing!
-  int selkeys[MAX_SELKEY] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', '0'};
+  int selkeys[] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', '0'};
   int nSelKeys = ARRAYSIZE(selkeys);
-  assert(nSelKeys >= MAX_SELKEY);
+  assert(nSelKeys <= MAX_SELKEY);
   chewing_set_selKey(ctx, selkeys, nSelKeys);
-  chewing_set_candPerPage(ctx, std::min(nSelKeys, MAX_SELKEY));
+  chewing_set_candPerPage(ctx, nSelKeys);
   instance->ctx = ctx;
   return NULL;
 }