[haiku-commits] Change in haiku[master]: input/MouseSettings: Fix return to NULL per clang

  • From: Gerrit <review@xxxxxxxxxxxxxxxxxxx>
  • To: waddlesplash <waddlesplash@xxxxxxxxx>, haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 11 Oct 2020 14:18:21 +0000

From Alex von Gluck IV <kallisti5@xxxxxxxxxxx>:

Alex von Gluck IV has uploaded this change for review. ( 
https://review.haiku-os.org/c/haiku/+/3303 ;)


Change subject: input/MouseSettings: Fix return to NULL per clang
......................................................................

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
---
M src/servers/input/MouseSettings.cpp
1 file changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://git.haiku-os.org:22/haiku refs/changes/03/3303/1

diff --git a/src/servers/input/MouseSettings.cpp 
b/src/servers/input/MouseSettings.cpp
index 1699845..d348cd7 100644
--- a/src/servers/input/MouseSettings.cpp
+++ b/src/servers/input/MouseSettings.cpp
@@ -422,12 +422,12 @@

        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;
 }



--
To view, visit https://review.haiku-os.org/c/haiku/+/3303
To unsubscribe, or for help writing mail filters, visit 
https://review.haiku-os.org/settings

Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: Id6c50369790b90e38fd6ec037c466c5fb314edf5
Gerrit-Change-Number: 3303
Gerrit-PatchSet: 1
Gerrit-Owner: Alex von Gluck IV <kallisti5@xxxxxxxxxxx>
Gerrit-MessageType: newchange

Other related posts:

  • » [haiku-commits] Change in haiku[master]: input/MouseSettings: Fix return to NULL per clang - Gerrit