From 42bacc5ad0253c68ff42efc3b01bcf829cbcbc90 Mon Sep 17 00:00:00 2001 From: Chen Gong Date: Wed, 30 Jan 2019 00:04:08 +0800 Subject: [PATCH] fix(rime_levers_api.h): customize_bool() misused `bool` type BREAKING CHANGE: in signature of C API function `customize_bool()`, change type `bool` to `Bool` (alias of `int`). Impact: the changed function is not in use by any first party code, known to be in use by osfans/trime. --- src/rime/lever/levers_module.cc | 4 ++-- src/rime_levers_api.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rime/lever/levers_module.cc b/src/rime/lever/levers_module.cc index e5ad1f2d9d..cf1571ed5b 100644 --- a/src/rime/lever/levers_module.cc +++ b/src/rime/lever/levers_module.cc @@ -63,8 +63,8 @@ static Bool rime_levers_save_settings(RimeCustomSettings* settings) { } static Bool rime_levers_customize_bool(RimeCustomSettings* settings, - const char* key, bool value) { - an item = New(value); + const char* key, Bool value) { + an item = New(bool(value)); auto custom_settings = reinterpret_cast(settings); return custom_settings->Customize(key, item); } diff --git a/src/rime_levers_api.h b/src/rime_levers_api.h index 2e26c8d5f8..5e266f4fd4 100644 --- a/src/rime_levers_api.h +++ b/src/rime_levers_api.h @@ -32,7 +32,7 @@ typedef struct rime_levers_api_t { void (*custom_settings_destroy)(RimeCustomSettings* settings); Bool (*load_settings)(RimeCustomSettings* settings); Bool (*save_settings)(RimeCustomSettings* settings); - Bool (*customize_bool)(RimeCustomSettings* settings, const char* key, bool value); + Bool (*customize_bool)(RimeCustomSettings* settings, const char* key, Bool value); Bool (*customize_int)(RimeCustomSettings* settings, const char* key, int value); Bool (*customize_double)(RimeCustomSettings* settings, const char* key, double value); Bool (*customize_string)(RimeCustomSettings* settings, const char* key, const char* value);