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

Consequently use B_{NULL,PREFERRED}_TOKEN to prevent problems with BMessage code checking against B_NULL_TOKEN.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11129 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2005-01-29 17:36:20 +00:00
parent c6de9dc035
commit 94b98dff1a
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Messenger.cpp
+8 -6
View File
@@ -43,6 +43,7 @@
#include <Messenger.h> #include <Messenger.h>
#include <OS.h> #include <OS.h>
#include <Roster.h> #include <Roster.h>
#include <TokenSpace.h>
// Project Includes ------------------------------------------------------------ // Project Includes ------------------------------------------------------------
#include <AppMisc.h> #include <AppMisc.h>
@@ -71,7 +72,7 @@ enum {
*/ */
BMessenger::BMessenger() BMessenger::BMessenger()
: fPort(-1), : fPort(-1),
fHandlerToken(-1), fHandlerToken(B_NULL_TOKEN),
fTeam(-1), fTeam(-1),
fPreferredTarget(false) fPreferredTarget(false)
{ {
@@ -94,7 +95,7 @@ BMessenger::BMessenger()
*/ */
BMessenger::BMessenger(const char *signature, team_id team, status_t *result) BMessenger::BMessenger(const char *signature, team_id team, status_t *result)
: fPort(-1), : fPort(-1),
fHandlerToken(-1), fHandlerToken(B_NULL_TOKEN),
fTeam(-1), fTeam(-1),
fPreferredTarget(false) fPreferredTarget(false)
{ {
@@ -119,7 +120,7 @@ BMessenger::BMessenger(const char *signature, team_id team, status_t *result)
BMessenger::BMessenger(const BHandler *handler, const BLooper *looper, BMessenger::BMessenger(const BHandler *handler, const BLooper *looper,
status_t *result) status_t *result)
: fPort(-1), : fPort(-1),
fHandlerToken(-1), fHandlerToken(B_NULL_TOKEN),
fTeam(-1), fTeam(-1),
fPreferredTarget(false) fPreferredTarget(false)
{ {
@@ -141,7 +142,8 @@ BMessenger::BMessenger(const BHandler *handler, const BLooper *looper,
BObjectLocker<BLooperList> locker(gLooperList); BObjectLocker<BLooperList> locker(gLooperList);
if (locker.IsLocked() && gLooperList.IsLooperValid(looper)) { if (locker.IsLocked() && gLooperList.IsLooperValid(looper)) {
fPort = looper->fMsgPort; fPort = looper->fMsgPort;
fHandlerToken = (handler ? _get_object_token_(handler) : -1); fHandlerToken = (handler
? _get_object_token_(handler) : B_PREFERRED_TOKEN);
fPreferredTarget = !handler; fPreferredTarget = !handler;
fTeam = looper->Team(); fTeam = looper->Team();
} else } else
@@ -508,7 +510,7 @@ BMessenger::SetTo(team_id team, port_id port, int32 token, bool preferred)
{ {
fTeam = team; fTeam = team;
fPort = port; fPort = port;
fHandlerToken = token; fHandlerToken = (preferred ? B_PREFERRED_TOKEN : token);
fPreferredTarget = preferred; fPreferredTarget = preferred;
} }
@@ -562,7 +564,7 @@ BMessenger::InitData(const char *signature, team_id team, status_t *result)
if (error == B_OK) { if (error == B_OK) {
fTeam = team; fTeam = team;
fPort = info.port; fPort = info.port;
fHandlerToken = 0; fHandlerToken = B_PREFERRED_TOKEN;
fPreferredTarget = true; fPreferredTarget = true;
} }
// return the error // return the error