TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove line breaks from stdout/stderr messages to improve readability.

Browse Source
pull/16/head
Darrell Anderson 12 years ago
parent 7f26e9d03b
commit e4f16abb29
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

32
dcop/dcopserver.cpp
Unescape Escape View File

@ -130,8 +130,8 @@ static TQCString readQCString(TQDataStream &ds)
int bytesLeft = device->size()-device->at(); int bytesLeft = device->size()-device->at();
if ((bytesLeft < 0 ) || (len > (uint) bytesLeft)) if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
{ {
tqWarning("[dcopserver] Corrupt data!\n"); tqWarning("[dcopserver] Corrupt data!");
printf("[dcopserver] bytesLeft: %d, len: %d\n", bytesLeft, len); printf("[dcopserver] bytesLeft: %d, len: %d", bytesLeft, len);
return result; return result;
} }
result.TQByteArray::resize( (uint)len ); result.TQByteArray::resize( (uint)len );
@ -149,7 +149,7 @@ static TQByteArray readQByteArray(TQDataStream &ds)
int bytesLeft = device->size()-device->at(); int bytesLeft = device->size()-device->at();
if ((bytesLeft < 0 ) || (len > (uint) bytesLeft)) if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
{ {
tqWarning("[dcopserver] Corrupt data!\n"); tqWarning("[dcopserver] Corrupt data!");
return result; return result;
} }
result.resize( (uint)len ); result.resize( (uint)len );
@ -645,7 +645,7 @@ SetAuthentication (int count, IceListenObj *_listenObjs,
if (command.isEmpty()) if (command.isEmpty())
{ {
fprintf( stderr, "[dcopserver] 'iceauth' not found in path, aborting.\n" ); fprintf( stderr, "[dcopserver] 'iceauth' not found in path, aborting." );
exit(1); exit(1);
} }
@ -1012,7 +1012,7 @@ DCOPServer::DCOPServer(bool _suicide)
if (!IceListenForConnections (&numTransports, &listenObjs, if (!IceListenForConnections (&numTransports, &listenObjs,
256, errormsg)) 256, errormsg))
{ {
fprintf (stderr, "[dcopserver] %s\n", errormsg); fprintf (stderr, "[dcopserver] %s", errormsg);
exit (1); exit (1);
} else { } else {
(void) umask(orig_umask); (void) umask(orig_umask);
@ -1020,7 +1020,7 @@ DCOPServer::DCOPServer(bool _suicide)
TQCString fName = DCOPClient::dcopServerFile(); TQCString fName = DCOPClient::dcopServerFile();
FILE *f; FILE *f;
if(!(f = ::fopen(fName.data(), "w+"))) { if(!(f = ::fopen(fName.data(), "w+"))) {
fprintf (stderr, "[dcopserver] Can not create file %s: %s\n", fprintf (stderr, "[dcopserver] Can not create file %s: %s",
fName.data(), ::strerror(errno)); fName.data(), ::strerror(errno));
exit(1); exit(1);
} }
@ -1158,9 +1158,9 @@ void DCOPServer::newClient( int /*socket*/ )
IceConn iceConn = IceAcceptConnection( static_cast<const DCOPListener*>(sender())->listenObj, &status); IceConn iceConn = IceAcceptConnection( static_cast<const DCOPListener*>(sender())->listenObj, &status);
if (!iceConn) { if (!iceConn) {
if (status == IceAcceptBadMalloc) if (status == IceAcceptBadMalloc)
tqWarning("[dcopserver] Failed to alloc connection object!\n"); tqWarning("[dcopserver] Failed to alloc connection object!");
else // IceAcceptFailure else // IceAcceptFailure
tqWarning("[dcopserver] Failed to accept ICE connection!\n"); tqWarning("[dcopserver] Failed to accept ICE connection!");
return; return;
} }
@ -1173,9 +1173,9 @@ void DCOPServer::newClient( int /*socket*/ )
if (cstatus != IceConnectAccepted) { if (cstatus != IceConnectAccepted) {
if (cstatus == IceConnectIOError) if (cstatus == IceConnectIOError)
tqWarning ("[dcopserver] IO error opening ICE Connection!\n"); tqWarning ("[dcopserver] IO error opening ICE Connection!");
else else
tqWarning ("[dcopserver] ICE Connection rejected!\n"); tqWarning ("[dcopserver] ICE Connection rejected!");
deadConnections.removeRef(iceConn); deadConnections.removeRef(iceConn);
(void) IceCloseConnection (iceConn); (void) IceCloseConnection (iceConn);
} }
@ -1290,7 +1290,7 @@ void DCOPServer::removeConnection( void* data )
void DCOPServer::slotTerminate() void DCOPServer::slotTerminate()
{ {
#ifndef NDEBUG #ifndef NDEBUG
fprintf( stderr, "[dcopserver] slotTerminate() -> sending terminateKDE signal.\n" ); fprintf( stderr, "[dcopserver] slotTerminate() -> sending terminateKDE signal." );
#endif #endif
TQByteArray data; TQByteArray data;
dcopSignals->emitSignal(0L /* dcopserver */, "terminateKDE()", data, false); dcopSignals->emitSignal(0L /* dcopserver */, "terminateKDE()", data, false);
@ -1302,7 +1302,7 @@ void DCOPServer::slotTerminate()
void DCOPServer::slotSuicide() void DCOPServer::slotSuicide()
{ {
#ifndef NDEBUG #ifndef NDEBUG
fprintf( stderr, "[dcopserver] slotSuicide() -> exit.\n" ); fprintf( stderr, "[dcopserver] slotSuicide() -> exit." );
#endif #endif
exit(0); exit(0);
} }
@ -1310,7 +1310,7 @@ void DCOPServer::slotSuicide()
void DCOPServer::slotShutdown() void DCOPServer::slotShutdown()
{ {
#ifndef NDEBUG #ifndef NDEBUG
fprintf( stderr, "[dcopserver] slotShutdown() -> waiting for clients to disconnect.\n" ); fprintf( stderr, "[dcopserver] slotShutdown() -> waiting for clients to disconnect." );
#endif #endif
char c; char c;
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
@ -1332,7 +1332,7 @@ void DCOPServer::slotShutdown()
void DCOPServer::slotExit() void DCOPServer::slotExit()
{ {
#ifndef NDEBUG #ifndef NDEBUG
fprintf( stderr, "[dcopserver] slotExit() -> exit.\n" ); fprintf( stderr, "[dcopserver] slotExit() -> exit." );
#endif #endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
SetEvent(m_evTerminate); SetEvent(m_evTerminate);
@ -1354,7 +1354,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
<< fun << "\", replyType =\"" << fun << "\", replyType =\""
<< replyType << "\", data.size() =\"" << replyType << "\", data.size() =\""
<< data.size() << "\", replyData.size() =" << data.size() << "\", replyData.size() ="
<< replyData.size() << "\n"; << replyData.size() << "";
m_logger->flush(); m_logger->flush();
#endif #endif
@ -1656,7 +1656,7 @@ const char* const ABOUT =
"Usage: dcopserver [--nofork] [--nosid] [--help]\n" "Usage: dcopserver [--nofork] [--nosid] [--help]\n"
" dcopserver --serverid\n" " dcopserver --serverid\n"
"\n" "\n"
"DCOP is KDE's Desktop Communications Protocol. It is a lightweight IPC/RPC\n" "DCOP is TDE's Desktop Communications Protocol. It is a lightweight IPC/RPC\n"
"mechanism built on top of the X Consortium's Inter Client Exchange protocol.\n" "mechanism built on top of the X Consortium's Inter Client Exchange protocol.\n"
"It enables desktop applications to communicate reliably with low overhead.\n" "It enables desktop applications to communicate reliably with low overhead.\n"
"\n" "\n"

Write Preview
Loading…
Cancel
Save