i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BRoster: minor cleanup.

Browse Source
This commit is contained in:
Axel Dörfler
2015-07-22 20:42:09 +02:00
parent 234f76a19c
commit 1f9826a778
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Roster.cpp
+6 -5
View File
@@ -499,7 +499,7 @@ BRoster::ArgVector::Init(int argc, const char* const* args,
{ {
// unset old values // unset old values
Unset(); Unset();
status_t error = (appRef ? B_OK : B_BAD_VALUE); status_t error = appRef ? B_OK : B_BAD_VALUE;
// get app path // get app path
if (error == B_OK) if (error == B_OK)
error = fAppPath.SetTo(appRef); error = fAppPath.SetTo(appRef);
@@ -509,19 +509,20 @@ BRoster::ArgVector::Init(int argc, const char* const* args,
fArgc = 1; fArgc = 1;
if (argc > 0 && args) { if (argc > 0 && args) {
fArgc += argc; fArgc += argc;
if (docRef && fDocPath.SetTo(docRef) == B_OK) { if (docRef != NULL && fDocPath.SetTo(docRef) == B_OK) {
fArgc++; fArgc++;
hasDocArg = true; 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) if (!fArgs)
error = B_NO_MEMORY; error = B_NO_MEMORY;
} }
// init vector // init vector
if (error == B_OK) { if (error == B_OK) {
fArgs[0] = fAppPath.Path(); fArgs[0] = fAppPath.Path();
if (argc > 0 && args) { if (argc > 0 && args != NULL) {
for (int i = 0; i < argc; i++) for (int i = 0; i < argc; i++)
fArgs[i + 1] = args[i]; fArgs[i + 1] = args[i];
if (hasDocArg) if (hasDocArg)
@@ -2176,7 +2177,7 @@ BRoster::_TranslateRef(entry_ref* ref, BMimeType* appMeta,
if (error != B_OK) if (error != B_OK)
return error; return error;
if ((permissions & S_IXUSR) && node.IsFile()) { if ((permissions & S_IXUSR) != 0 && node.IsFile()) {
// node is executable and a file // node is executable and a file
error = appFile->SetTo(ref, B_READ_ONLY); error = appFile->SetTo(ref, B_READ_ONLY);
if (error != B_OK) if (error != B_OK)