summaryrefslogtreecommitdiff
path: root/binaryninjacore.h
diff options
context:
space:
mode:
authorBrian Potchik <brian@vector35.com>2019-08-07 15:30:53 -0400
committerBrian Potchik <brian@vector35.com>2019-08-07 15:30:53 -0400
commit25cf00a276d9a3da3134601d82654c87bcd9ef9c (patch)
treecb4411e48db783440a6ef0f1dece3ccea5e3a7a6 /binaryninjacore.h
parent4704a1ee70e5b1a82989b2b3b016146fc183aefe (diff)
Settings system improvements.
Diffstat (limited to 'binaryninjacore.h')
-rw-r--r--binaryninjacore.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/binaryninjacore.h b/binaryninjacore.h
index 8cf053e5..9e70251e 100644
--- a/binaryninjacore.h
+++ b/binaryninjacore.h
@@ -2037,9 +2037,9 @@ extern "C"
SettingsInvalidScope = 0,
SettingsAutoScope = 1,
SettingsDefaultScope = 2,
- SettingsUserScope = 3,
- SettingsWorkspaceScope = 4,
- SettingsContextScope = 5
+ SettingsUserScope = 4,
+ SettingsWorkspaceScope = 8,
+ SettingsContextScope = 0x10
};
BINARYNINJACOREAPI char* BNAllocString(const char* contents);
@@ -3951,7 +3951,7 @@ extern "C"
BINARYNINJACOREAPI bool BNSettingsUpdateStringProperty(BNSettings* settings, const char* key, const char* property, const char* value);
BINARYNINJACOREAPI bool BNSettingsUpdateStringListProperty(BNSettings* settings, const char* key, const char* property, const char** value, size_t size);
- BINARYNINJACOREAPI bool BNSettingsDeserializeSchema(BNSettings* settings, const char* schema);
+ BINARYNINJACOREAPI bool BNSettingsDeserializeSchema(BNSettings* settings, const char* schema, BNSettingsScope scope, bool merge);
BINARYNINJACOREAPI char* BNSettingsSerializeSchema(BNSettings* settings);
BINARYNINJACOREAPI bool BNDeserializeSettings(BNSettings* settings, const char* contents, BNBinaryView* view, BNSettingsScope scope);
BINARYNINJACOREAPI char* BNSerializeSettings(BNSettings* settings, BNBinaryView* view, BNSettingsScope scope);