diff options
| author | Odd Stranne <odd@mullvad.net> | 2019-03-15 09:25:39 +0100 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2019-04-04 20:16:55 +0200 |
| commit | 147804e86ab2a8cb8972d799e10ef16d0b889f89 (patch) | |
| tree | de98900ab27cc54af8091e728068d7ec5731896c | |
| parent | 52d0866ef32089e56f0c4e29509932a697b7092f (diff) | |
| download | mullvadvpn-147804e86ab2a8cb8972d799e10ef16d0b889f89.tar.xz mullvadvpn-147804e86ab2a8cb8972d799e10ef16d0b889f89.zip | |
Fix variable names for consistency
| -rw-r--r-- | windows/winfw/src/winfw/winfw.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/windows/winfw/src/winfw/winfw.cpp b/windows/winfw/src/winfw/winfw.cpp index f391d691b2..6f61cb212b 100644 --- a/windows/winfw/src/winfw/winfw.cpp +++ b/windows/winfw/src/winfw/winfw.cpp @@ -10,8 +10,8 @@ namespace uint32_t g_timeout = 0; -WinFwErrorSink g_ErrorSink = nullptr; -void * g_ErrorContext = nullptr; +WinFwErrorSink g_errorSink = nullptr; +void * g_errorContext = nullptr; FwContext *g_fwContext = nullptr; @@ -38,8 +38,8 @@ WinFw_Initialize( // Convert seconds to milliseconds. g_timeout = timeout * 1000; - g_ErrorSink = errorSink; - g_ErrorContext = errorContext; + g_errorSink = errorSink; + g_errorContext = errorContext; try { @@ -47,9 +47,9 @@ WinFw_Initialize( } catch (std::exception &err) { - if (nullptr != g_ErrorSink) + if (nullptr != g_errorSink) { - g_ErrorSink(err.what(), g_ErrorContext); + g_errorSink(err.what(), g_errorContext); } return false; @@ -97,9 +97,9 @@ WinFw_ApplyPolicyConnecting( } catch (std::exception &err) { - if (nullptr != g_ErrorSink) + if (nullptr != g_errorSink) { - g_ErrorSink(err.what(), g_ErrorContext); + g_errorSink(err.what(), g_errorContext); } return false; @@ -132,9 +132,9 @@ WinFw_ApplyPolicyConnected( } catch (std::exception &err) { - if (nullptr != g_ErrorSink) + if (nullptr != g_errorSink) { - g_ErrorSink(err.what(), g_ErrorContext); + g_errorSink(err.what(), g_errorContext); } return false; @@ -163,9 +163,9 @@ WinFw_ApplyPolicyBlocked( } catch (std::exception &err) { - if (nullptr != g_ErrorSink) + if (nullptr != g_errorSink) { - g_ErrorSink(err.what(), g_ErrorContext); + g_errorSink(err.what(), g_errorContext); } return false; @@ -196,9 +196,9 @@ WinFw_Reset() } catch (std::exception &err) { - if (nullptr != g_ErrorSink) + if (nullptr != g_errorSink) { - g_ErrorSink(err.what(), g_ErrorContext); + g_errorSink(err.what(), g_errorContext); } return false; |