erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 00:15:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

feat(core): address code review comments

Browse source 
- rename `km_core_keyboard_load_from_blob_internal` to
  `keyboard_load_from_blob_internal` since it's not part of the API
- use size of struct instead of hard-coding minimum KMX file size
This commit is contained in:
Eberhard Beilharz 2024-10-07 18:04:41 +02:00
parent 1c88166f6e
commit 069cd21ecd
No known key found for this signature in database
GPG key ID: E9140597606020D3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/km_core_keyboard_api.cpp
View file

@ -40,7 +40,7 @@ namespace
} // namespace
km_core_status
km_core_keyboard_load_from_blob_internal(
keyboard_load_from_blob_internal(
const km_core_path_name kb_name,
const std::vector<uint8_t> & buf,
km_core_keyboard** keyboard
@ -78,7 +78,7 @@ km_core_keyboard_load_from_blob(
}
std::vector<uint8_t> buf((uint8_t*)blob, (uint8_t*)blob + blob_size);
return km_core_keyboard_load_from_blob_internal(kb_name, buf, keyboard);
return keyboard_load_from_blob_internal(kb_name, buf, keyboard);
}
// TODO-web-core: Remove this code when we remove the deprecated km_core_keyboard_load method
@ -123,7 +123,7 @@ km_core_keyboard_load(km_core_path_name kb, km_core_keyboard **keyboard)
// Some legacy packages may include upper-case file extensions
if (kb_path.suffix() == ".kmx" || kb_path.suffix() == ".KMX") {
std::vector<uint8_t> buf = load_kmx_file(kb_path);
status = km_core_keyboard_load_from_blob_internal(kb_path.stem().c_str(), buf, (km_core_keyboard**)&kp);
status = keyboard_load_from_blob_internal(kb_path.stem().c_str(), buf, (km_core_keyboard**)&kp);
if (status != KM_CORE_STATUS_OK) {
return status;
}

2
core/src/kmx/kmx_processor.cpp
View file

@ -423,7 +423,7 @@ bool kmx_processor::is_handled(const std::vector<uint8_t>& data) {
return false;
}
if (data.size() < 64) { // a KMX file is at least 64 bytes (KMX header)
if (data.size() < sizeof(COMP_KEYBOARD)) { // a KMX file is at least 64 bytes (KMX header)
return false;
}