hrev54630 adds 1 changeset to branch 'master'
old head: e43fabeb86ad6d111793ee9452b134cb591bdc30
new head: 5646b997786c9d11b9e1fda98b855bef6320da54
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=5646b997786c+%5Ee43fabeb86ad
----------------------------------------------------------------------------
5646b997786c: input/MouseSettings: Fix return to NULL per clang
* This looks wrong, but is functionally equal.
* Supposed to return a MouseSettings*, but returned
a B_OK (0) on a seemingly error result (NULL).
Change-Id: Id6c50369790b90e38fd6ec037c466c5fb314edf5
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3303
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54630
Commit: 5646b997786c9d11b9e1fda98b855bef6320da54
URL: https://git.haiku-os.org/haiku/commit/?id=5646b997786c
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Sun Oct 11 14:16:00 2020 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Sun Oct 11 15:44:42 2020 UTC
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 2 deletions(-)
src/servers/input/MouseSettings.cpp | 4 ++--
----------------------------------------------------------------------------
diff --git a/src/servers/input/MouseSettings.cpp
b/src/servers/input/MouseSettings.cpp
index 1699845de9..d348cd75ab 100644
--- a/src/servers/input/MouseSettings.cpp
+++ b/src/servers/input/MouseSettings.cpp
@@ -422,12 +422,12 @@ MultipleMouseSettings::AddMouseSettings(BString
mouse_name)
MouseSettings* settings = new (std::nothrow) MouseSettings();
- if(settings !=NULL) {
+ if(settings != NULL) {
fMouseSettingsObject.insert(std::pair<BString, MouseSettings*>
(mouse_name, settings));
return settings;
}
- return B_OK;
+ return NULL;
}
