aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeddy Wing2018-10-21 09:56:05 +0200
committerTeddy Wing2018-10-21 09:56:05 +0200
commit923de9b3dfeebdba72cb70151b2b5a450997b7e1 (patch)
tree0499bd01adaa47249665cc158378eb76f388f18f
parente6b01e84d469fe7d17193e0a03b559a38cc175ee (diff)
downloaddome-key-map-923de9b3dfeebdba72cb70151b2b5a450997b7e1.tar.bz2
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.)
-rw-r--r--dome_key_map.h2
-rw-r--r--src/cocoa_bridge.rs2
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) => {