[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/icecream-make-it-cool/services
From:       Dirk Mueller <mueller () kde ! org>
Date:       2007-07-17 16:59:52
Message-ID: 1184691592.481775.17024.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 689105 by mueller:

send_msg is always blocking, remove parameter


 M  +4 -6      comm.cpp  
 M  +1 -1      comm.h  


--- branches/work/icecream-make-it-cool/services/comm.cpp #689104:689105
@@ -220,8 +220,7 @@
 void
 MsgChannel::chop_output ()
 {
-  if (msgofs > 8192
-      || msgtogo <= 16)
+  if (msgofs > 8192 || msgtogo <= 16)
     {
       if (msgtogo)
         memmove (msgbuf, msgbuf + msgofs, msgtogo);
@@ -901,10 +900,9 @@
 }
 
 bool
-MsgChannel::send_msg (const Msg &m, bool blocking)
+MsgChannel::send_msg (const Msg &m)
 {
-  if (instate == NEED_PROTO
-      && !wait_for_protocol ())
+  if (instate == NEED_PROTO && !wait_for_protocol ())
     return false;
   chop_output ();
   size_t msgtogo_old = msgtogo;
@@ -919,7 +917,7 @@
       uint32_t len = htonl (msgtogo - msgtogo_old - 4);
       memcpy (msgbuf + msgtogo_old, &len, 4);
     }
-  return flush_writebuf (blocking);
+  return flush_writebuf (true /* blocking*/);
 }
 
 #include "getifaddrs.h"
--- branches/work/icecream-make-it-cool/services/comm.h #689104:689105
@@ -145,7 +145,7 @@
   // NULL  <--> channel closed
   Msg *get_msg(int timeout = 10);
   // false <--> error (msg not send)
-  bool send_msg (const Msg &, bool blocking = true);
+  bool send_msg (const Msg &);
   // return last error (0 == no error)
   int error(void) {return 0;}
   bool has_msg (void) const { return eof || instate == HAS_MSG; }
[prev in list] [next in list] [prev in thread] [next in thread]