Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Got rid of the temporary BMessage in BMessage::_send_(). 

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11450 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2005-02-22 13:07:55 +00:00
parent 75393a9870
commit 2a862ff06f
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/kits/app/Message.cpp
View File

@ -1893,11 +1893,9 @@ status_t BMessage::_send_(port_id port, int32 token, bool preferred,
{
PRINT(("BMessage::_send_(port: %ld, token: %ld, preferred: %d): "
"what: %lx (%.4s)\n", port, token, preferred, what, (char*)&what));
BMessage tmp_msg;
tmp_msg.fPreferred = fPreferred;
tmp_msg.fTarget = fTarget;
tmp_msg.fReplyRequired = fReplyRequired;
tmp_msg.fReplyTo = fReplyTo;
bool oldPreferred = fPreferred;
int32 oldTarget = fTarget;
reply_to_info oldReplyTo = fReplyTo;
if (!reply_to.IsValid()) {
BMessenger::Private(reply_to).SetTo(fReplyTo.team, fReplyTo.port, fReplyTo.target, fReplyTo.preferred);
@ -1929,11 +1927,12 @@ PRINT(("BMessage::_send_(port: %ld, token: %ld, preferred: %d): "
{
delete[] p;
}
self->fPreferred = tmp_msg.fPreferred;
self->fTarget = tmp_msg.fTarget;
self->fReplyRequired = false; //tmp_msg.fReplyRequired;
self->fReplyTo = tmp_msg.fReplyTo;
tmp_msg.init_data();
self->fPreferred = oldPreferred;
self->fTarget = oldTarget;
self->fReplyRequired = false; // To this copy, no reply is required.
// Only relevant when forwarding anyway.
self->fReplyTo = oldReplyTo;
PRINT(("BMessage::_send_() done: %lx\n", err));
return err;
}