aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaturneric <[email protected]>2023-07-13 12:03:32 +0000
committerSaturneric <[email protected]>2023-07-13 12:03:32 +0000
commitd6110b5bab1ee4aaa982930a3554946462edc6eb (patch)
tree3fd9de3c497c7b02691de0feb8b044ccadf0c354
parentfix: sole compile issue in linux platform (diff)
downloadGpgFrontend-d6110b5bab1ee4aaa982930a3554946462edc6eb.tar.gz
GpgFrontend-d6110b5bab1ee4aaa982930a3554946462edc6eb.zip
fix: solve compile issues
-rw-r--r--src/core/function/gpg/GpgKeyManager.cpp58
-rw-r--r--src/core/function/gpg/GpgKeyManager.h16
2 files changed, 37 insertions, 37 deletions
diff --git a/src/core/function/gpg/GpgKeyManager.cpp b/src/core/function/gpg/GpgKeyManager.cpp
index 3e87f0dd..e556eec6 100644
--- a/src/core/function/gpg/GpgKeyManager.cpp
+++ b/src/core/function/gpg/GpgKeyManager.cpp
@@ -111,40 +111,40 @@ bool GpgFrontend::GpgKeyManager::SetOwnerTrustLevel(const GpgKey& key,
boost::split(tokens, args, boost::is_any_of(" "));
switch (state) {
- case START:
+ case AS_START:
if (status == "GET_LINE" && args == "keyedit.prompt")
- return COMMAND;
- return ERROR;
- case COMMAND:
+ return AS_COMMAND;
+ return AS_ERROR;
+ case AS_COMMAND:
if (status == "GET_LINE" && args == "edit_ownertrust.value") {
- return VALUE;
+ return AS_VALUE;
}
- return ERROR;
- case VALUE:
+ return AS_ERROR;
+ case AS_VALUE:
if (status == "GET_LINE" && args == "keyedit.prompt") {
- return QUIT;
+ return AS_QUIT;
} else if (status == "GET_BOOL" &&
args == "edit_ownertrust.set_ultimate.okay") {
- return REALLY_ULTIMATE;
+ return AS_REALLY_ULTIMATE;
}
- return ERROR;
- case REALLY_ULTIMATE:
+ return AS_ERROR;
+ case AS_REALLY_ULTIMATE:
if (status == "GET_LINE" && args == "keyedit.prompt") {
- return QUIT;
+ return AS_QUIT;
}
- return ERROR;
- case QUIT:
+ return AS_ERROR;
+ case AS_QUIT:
if (status == "GET_LINE" && args == "keyedit.save.okay") {
- return SAVE;
+ return AS_SAVE;
}
- return ERROR;
- case ERROR:
+ return AS_ERROR;
+ case AS_ERROR:
if (status == "GET_LINE" && args == "keyedit.prompt") {
- return QUIT;
+ return AS_QUIT;
}
- return ERROR;
+ return AS_ERROR;
default:
- return ERROR;
+ return AS_ERROR;
};
};
@@ -152,21 +152,21 @@ bool GpgFrontend::GpgKeyManager::SetOwnerTrustLevel(const GpgKey& key,
[trust_level](AutomatonHandelStruct& handler, AutomatonState state) {
SPDLOG_DEBUG("action_handler state: {}", state);
switch (state) {
- case COMMAND:
+ case AS_COMMAND:
return std::string("trust");
- case VALUE:
+ case AS_VALUE:
handler.SetSuccess(true);
return std::to_string(trust_level);
- case REALLY_ULTIMATE:
+ case AS_REALLY_ULTIMATE:
handler.SetSuccess(true);
return std::string("Y");
- case QUIT:
+ case AS_QUIT:
return std::string("quit");
- case SAVE:
+ case AS_SAVE:
handler.SetSuccess(true);
return std::string("Y");
- case START:
- case ERROR:
+ case AS_START:
+ case AS_ERROR:
return std::string("");
default:
return std::string("");
@@ -221,12 +221,12 @@ gpgme_error_t GpgFrontend::GpgKeyManager::interactor_cb_fnc(void* handle,
}
AutomatonState next_state = handle_struct->NextState(status_s, args_s);
- if (next_state == ERROR) {
+ if (next_state == AS_ERROR) {
SPDLOG_DEBUG("handle struct next state caught error, skipping...");
return GPG_ERR_FALSE;
}
- if (next_state == SAVE) {
+ if (next_state == AS_SAVE) {
handle_struct->SetSuccess(true);
}
diff --git a/src/core/function/gpg/GpgKeyManager.h b/src/core/function/gpg/GpgKeyManager.h
index f967dee7..62f7baca 100644
--- a/src/core/function/gpg/GpgKeyManager.h
+++ b/src/core/function/gpg/GpgKeyManager.h
@@ -99,13 +99,13 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyManager
using Command = std::string;
using AutomatonState = enum {
- START,
- COMMAND,
- VALUE,
- REALLY_ULTIMATE,
- SAVE,
- ERROR,
- QUIT,
+ AS_START,
+ AS_COMMAND,
+ AS_VALUE,
+ AS_REALLY_ULTIMATE,
+ AS_SAVE,
+ AS_ERROR,
+ AS_QUIT,
};
struct AutomatonHandelStruct;
@@ -137,7 +137,7 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyManager
AutomatonHandelStruct(std::string key_fpr) : key_fpr_(key_fpr) {}
private:
- AutomatonState current_state_ = START;
+ AutomatonState current_state_ = AS_START;
AutomatonNextStateHandler next_state_handler_;
AutomatonActionHandler action_handler_;
bool success_ = false;