[brlcad-commits] SF.net SVN: brlcad:[40751] rt^3/trunk/src/libNet/Portal.cxx
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <dav...@us...> - 2010-09-28 18:31:16
|
Revision: 40751 http://brlcad.svn.sourceforge.net/brlcad/?rev=40751&view=rev Author: davidloman Date: 2010-09-28 18:31:10 +0000 (Tue, 28 Sep 2010) Log Message: ----------- WS, Formatting. Modified Paths: -------------- rt^3/trunk/src/libNet/Portal.cxx Modified: rt^3/trunk/src/libNet/Portal.cxx =================================================================== --- rt^3/trunk/src/libNet/Portal.cxx 2010-09-28 18:30:12 UTC (rev 40750) +++ rt^3/trunk/src/libNet/Portal.cxx 2010-09-28 18:31:10 UTC (rev 40751) @@ -84,7 +84,7 @@ } int Portal::read() { int retval = 0; - this->log->logINFO("Portal", "Read"); + /* const pkg_switch* table = this->pkgClient->getCallBackTable(); pkg_switch sw = table[0]; @@ -97,7 +97,7 @@ retval = this->pkgClient->processData(); if (retval < 0) { this->log->logERROR("Portal", - "Unable to process packets? Weird. (1) \n"); + "Unable to process packets? Weird. (1) "); return retval; }//TODO do we need to check for ==0 ? @@ -105,17 +105,17 @@ retval = this->pkgClient->pullDataFromSocket(); if (retval < 0) { this->log->logERROR("Portal", - "Seemed to have trouble pulling the data from the socket.\n"); + "Seemed to have trouble pulling the data from the socket."); return retval; } else if (retval == 0) { - this->log->logERROR("Portal", "Client closed the connection.\n"); + this->log->logERROR("Portal", "Client closed the connection."); return retval; } retval = this->pkgClient->processData(); if (retval < 0) { - this->log->logERROR("Portal", "Unable to process packets? Weird. (2)\n"); + this->log->logERROR("Portal", "Unable to process packets? Weird. (2)"); return retval; }//TODO do we need to check for ==0 ? @@ -162,13 +162,9 @@ QByteArray ba(buf, len); - QString s("Got "); - s.append(QString::number(len)); - s.append(" bytes."); - Logger::getInstance()->logINFO("Portal(s)", s); - if (conn->pkc_user_data == 0) { - bu_bomb("pkg callback returned a NULL user_data pointer!\n"); + bu_log("pkg callback returned a NULL user_data pointer!\n"); + } Portal* p = (Portal*) conn->pkc_user_data; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |