From 923de9b3dfeebdba72cb70151b2b5a450997b7e1 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Sun, 21 Oct 2018 09:56:05 +0200 Subject: Rename `config_read_from_file` to `config_get` For the same reason that we renamed the Rust version of this function to `get_config`, rename this function also. (Since we're not necessarily getting the config from a file.) --- dome_key_map.h | 2 +- src/cocoa_bridge.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dome_key_map.h b/dome_key_map.h index b61133d..a6e44ca 100644 --- a/dome_key_map.h +++ b/dome_key_map.h @@ -42,7 +42,7 @@ void c_run_key_action(State *state, Trigger trigger, const Trigger *mode); void config_free(Config *ptr); -Config *config_read_from_file(void); +Config *config_get(void); extern void dkess_press_key(int16_t key, CGEventFlags modifier_flags); diff --git a/src/cocoa_bridge.rs b/src/cocoa_bridge.rs index 1dbd187..7b707de 100644 --- a/src/cocoa_bridge.rs +++ b/src/cocoa_bridge.rs @@ -332,7 +332,7 @@ pub extern "C" fn c_parse_args( } #[no_mangle] -pub extern "C" fn config_read_from_file() -> *mut Config { +pub extern "C" fn config_get() -> *mut Config { match config::get_config() { Ok(config) => Box::into_raw(Box::new(config)), Err(e) => { -- cgit v1.2.3