Added check for valid size to show().

[lyx.git] / src / lyxsocket.C

diff --git a/src/lyxsocket.C b/src/lyxsocket.C
index d48ea477d4b7001c0a2c0ffdd7ea43bb67432c45..75f2e7549562d6e627d27799a19172d2b6c93627 100644 (file)
--- a/src/lyxsocket.C
+++ b/src/lyxsocket.C
@@ -69,7 +69,7 @@ LyXServerSocket::LyXServerSocket(LyXFunc * f, string const & addr)
                boost::bind(&LyXServerSocket::serverCallback, this)
                );
 
-       lyxerr[Debug::LYXSERVER] << "lyx: New server socket "
+       LYXERR(Debug::LYXSERVER) << "lyx: New server socket "
                                 << fd_ << ' ' << address_ << endl;
 }
 
@@ -85,7 +85,7 @@ LyXServerSocket::~LyXServerSocket()
                               << " IO error on closing: " << strerror(errno);
        }
        support::unlink(support::FileName(address_));
-       lyxerr[Debug::LYXSERVER] << "lyx: Server socket quitting" << endl;
+       LYXERR(Debug::LYXSERVER) << "lyx: Server socket quitting" << endl;
 }
 
 
@@ -102,7 +102,7 @@ void LyXServerSocket::serverCallback()
        int const client_fd = support::socktools::accept(fd_);
 
        if (fd_ == -1) {
-               lyxerr[Debug::LYXSERVER] << "lyx: Failed to accept new client"
+               LYXERR(Debug::LYXSERVER) << "lyx: Failed to accept new client"
                                         << endl;
                return;
        }
@@ -203,7 +203,7 @@ void LyXServerSocket::writeln(string const & line)
 LyXDataSocket::LyXDataSocket(int fd)
        : fd_(fd), connected_(true)
 {
-       lyxerr[Debug::LYXSERVER] << "lyx: New data socket " << fd_ << endl;
+       LYXERR(Debug::LYXSERVER) << "lyx: New data socket " << fd_ << endl;
 }
 
 
@@ -214,7 +214,7 @@ LyXDataSocket::~LyXDataSocket()
                       << " IO error on closing: " << strerror(errno);
 
        theApp()->unregisterSocketCallback(fd_);
-       lyxerr[Debug::LYXSERVER] << "lyx: Data socket " << fd_ << " quitting."
+       LYXERR(Debug::LYXSERVER) << "lyx: Data socket " << fd_ << " quitting."
                                 << endl;
 }
 
@@ -240,7 +240,7 @@ bool LyXDataSocket::readln(string & line)
        // Error conditions. The buffer must still be
        // processed for lines read
        if (count == 0) { // EOF -- connection closed
-               lyxerr[Debug::LYXSERVER] << "lyx: Data socket " << fd_
+               LYXERR(Debug::LYXSERVER) << "lyx: Data socket " << fd_
                                         << ": connection closed." << endl;
                connected_ = false;
        } else if ((count == -1) && (errno != EAGAIN)) { // IO error
@@ -252,7 +252,7 @@ bool LyXDataSocket::readln(string & line)
        // Cut a line from buffer
        string::size_type pos = buffer_.find('\n');
        if (pos == string::npos) {
-               lyxerr[Debug::LYXSERVER] << "lyx: Data socket " << fd_
+               LYXERR(Debug::LYXSERVER) << "lyx: Data socket " << fd_
                                         << ": line not completed." << endl;
                return false; // No complete line stored
        }