diff options
author | Mikkel Krautz <mikkel@krautz.dk> | 2015-02-27 20:49:28 +0300 |
---|---|---|
committer | Mikkel Krautz <mikkel@krautz.dk> | 2015-04-22 22:03:55 +0300 |
commit | b29df64a04b08fea9c8e8212591b1dfc98f1f534 (patch) | |
tree | 0e7743e04c5cc5f4518346dba1bc9cb0c9211765 /overlay | |
parent | 6c446e4ead44a66b5706a95b410f5429e7890b9f (diff) |
Rename 'missing magic argument' error to 'no arguments' in overlay helper.
Now that the helper takes more than one argument, the
old name is not descriptive enough.
Diffstat (limited to 'overlay')
-rw-r--r-- | overlay/overlay_exe/overlay_exe.cpp | 2 | ||||
-rw-r--r-- | overlay/overlay_exe/overlay_exe.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/overlay/overlay_exe/overlay_exe.cpp b/overlay/overlay_exe/overlay_exe.cpp index bee53bdf7..d087961ed 100644 --- a/overlay/overlay_exe/overlay_exe.cpp +++ b/overlay/overlay_exe/overlay_exe.cpp @@ -128,7 +128,7 @@ int main(int argc, char **argv) { size_t sep = commandLine.find(doubleSpace); if (sep == std::string::npos) { Alert(L"Mumble Overlay", L"This program is not meant to be run by itself. Run 'mumble.exe' instead."); - return OVERLAY_HELPER_ERROR_EXE_MISSING_MAGIC_ARGUMENT; + return OVERLAY_HELPER_ERROR_EXE_NO_ARGUMENTS; } // The Mumble process passes the overlay magic number, diff --git a/overlay/overlay_exe/overlay_exe.h b/overlay/overlay_exe/overlay_exe.h index e950aeed9..e7224bdcf 100644 --- a/overlay/overlay_exe/overlay_exe.h +++ b/overlay/overlay_exe/overlay_exe.h @@ -40,9 +40,9 @@ const wchar_t *MUMBLE_OVERLAY_DLL_NAME = L"mumble_ol_x64.dll"; /// OverlayHelperError represents exit codes returned by the
/// overlay helper process (mumble_ol.exe) on Windows.
enum OverlayHelperError {
- /// The overlay helper process was not passed a magic
- /// number as its first and only argument.
- OVERLAY_HELPER_ERROR_EXE_MISSING_MAGIC_ARGUMENT = -1,
+ /// The overlay helper process was not passed any
+ /// arguments.
+ OVERLAY_HELPER_ERROR_EXE_NO_ARGUMENTS = -1,
/// The magic number on the command line of the overlay
/// helper process could not be converted to an integer.
OVERLAY_HELPER_ERROR_EXE_INVALID_MAGIC_ARGUMENT = -2,
@@ -92,7 +92,7 @@ enum OverlayHelperError { static inline const char *OverlayHelperErrorToString(OverlayHelperError err) {
#define OHE(x) case x: return #x
switch (err) {
- OHE(OVERLAY_HELPER_ERROR_EXE_MISSING_MAGIC_ARGUMENT);
+ OHE(OVERLAY_HELPER_ERROR_EXE_NO_ARGUMENTS);
OHE(OVERLAY_HELPER_ERROR_EXE_INVALID_MAGIC_ARGUMENT);
OHE(OVERLAY_HELPER_ERROR_EXE_MAGIC_MISMATCH);
OHE(OVERLAY_HELPER_ERROR_EXE_CONFIGURE_ENVIRONMENT);
|