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

Fixed return codes in InitData().

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@623 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2002-08-06 22:19:37 +00:00
parent 9231d6b096
commit 672c1ea9ba
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Messenger.cpp
+13 -4
View File
@@ -589,10 +589,15 @@ BMessenger::InitData(const char *signature, team_id team, status_t *result)
if (team < 0) { if (team < 0) {
if (signature) { if (signature) {
team = be_roster->TeamFor(signature); team = be_roster->TeamFor(signature);
if (team < 0) if (team < 0) {
error = team; error = team;
// B_ERROR means that no application with the given signature
// is running. But we are supposed to return B_BAD_VALUE.
if (error == B_ERROR)
error = B_BAD_VALUE;
}
} else } else
error = B_BAD_VALUE; error = B_BAD_TYPE;
} }
// get the app_info of the team // get the app_info of the team
app_info info; app_info info;
@@ -600,10 +605,14 @@ BMessenger::InitData(const char *signature, team_id team, status_t *result)
error = be_roster->GetRunningAppInfo(team, &info); error = be_roster->GetRunningAppInfo(team, &info);
// check, whether the signature is correct // check, whether the signature is correct
if (error == B_OK && signature && strcmp(signature, info.signature) != 0) if (error == B_OK && signature && strcmp(signature, info.signature) != 0)
error = B_BAD_VALUE; error = B_MISMATCHED_VALUES;
// check whether it the app flags say B_ARGV_ONLY // check whether it the app flags say B_ARGV_ONLY
if (error == B_OK && (info.flags & B_ARGV_ONLY)) if (error == B_OK && (info.flags & B_ARGV_ONLY)) {
error = B_BAD_TYPE; error = B_BAD_TYPE;
// Set the team ID nevertheless -- that's what Be's implementation
// does. Don't know, if that is a bug, but at least it doesn't harm.
fTeam = team;
}
// init our members // init our members
if (error == B_OK) { if (error == B_OK) {
fTeam = team; fTeam = team;