From 1f9826a7784b0335afd89e9e0a06ad92a4b6dfeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Wed, 17 Jun 2015 17:00:54 +0200
Subject: [PATCH] BRoster: minor cleanup.

---
 src/kits/app/Roster.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/kits/app/Roster.cpp b/src/kits/app/Roster.cpp
index 6e8f14c0cd..23ecb83238 100644
--- a/src/kits/app/Roster.cpp
+++ b/src/kits/app/Roster.cpp
@@ -499,7 +499,7 @@ BRoster::ArgVector::Init(int argc, const char* const* args,
 {
 	// unset old values
 	Unset();
-	status_t error = (appRef ? B_OK : B_BAD_VALUE);
+	status_t error = appRef ? B_OK : B_BAD_VALUE;
 	// get app path
 	if (error == B_OK)
 		error = fAppPath.SetTo(appRef);
@@ -509,19 +509,20 @@ BRoster::ArgVector::Init(int argc, const char* const* args,
 		fArgc = 1;
 		if (argc > 0 && args) {
 			fArgc += argc;
-			if (docRef && fDocPath.SetTo(docRef) == B_OK) {
+			if (docRef != NULL && fDocPath.SetTo(docRef) == B_OK) {
 				fArgc++;
 				hasDocArg = true;
 			}
 		}
-		fArgs = new(nothrow) const char*[fArgc + 1];	// + 1 for term. NULL
+		fArgs = new(nothrow) const char*[fArgc + 1];
+			// + 1 for the terminating NULL
 		if (!fArgs)
 			error = B_NO_MEMORY;
 	}
 	// init vector
 	if (error == B_OK) {
 		fArgs[0] = fAppPath.Path();
-		if (argc > 0 && args) {
+		if (argc > 0 && args != NULL) {
 			for (int i = 0; i < argc; i++)
 				fArgs[i + 1] = args[i];
 			if (hasDocArg)
@@ -2176,7 +2177,7 @@ BRoster::_TranslateRef(entry_ref* ref, BMimeType* appMeta,
 	if (error != B_OK)
 		return error;
 
-	if ((permissions & S_IXUSR) && node.IsFile()) {
+	if ((permissions & S_IXUSR) != 0 && node.IsFile()) {
 		// node is executable and a file
 		error = appFile->SetTo(ref, B_READ_ONLY);
 		if (error != B_OK)