X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxserver.C;h=a6213f9deefe2fce95e8559d0ff8c1d7d8daef65;hb=d13d6da879462707cd947cdf00c0cf7c3dfac924;hp=093239d507e826a1de1a897de6eca41ba319cbcc;hpb=d9bf52e7c5af5ad439398718b6c2b37b53d927dc;p=lyx.git

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 093239d507..a6213f9dee 100644
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -147,8 +147,6 @@ void LyXComm::closeConnection()
 
 int LyXComm::startPipe(string const & filename, bool write)
 {
-	int fd;
-
 #ifdef __EMX__
 	HPIPE os2fd;
 	APIRET rc;
@@ -181,7 +179,7 @@ int LyXComm::startPipe(string const & filename, bool write)
 	};
 	// Imported handles can be used both with OS/2 APIs and emx
 	// library functions.
-	fd = _imphandle(os2fd);
+	int const fd = _imphandle(os2fd);
 #else
 	if (::access(filename.c_str(), F_OK) == 0) {
 		lyxerr << "LyXComm: Pipe " << filename << " already exists.\n"
@@ -196,7 +194,8 @@ int LyXComm::startPipe(string const & filename, bool write)
 		       << strerror(errno) << endl;
 		return -1;
 	};
-	fd = ::open(filename.c_str(), write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK));
+	int const fd = ::open(filename.c_str(),
+			      write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK));
 #endif
 
 	if (fd < 0) {
@@ -207,7 +206,7 @@ int LyXComm::startPipe(string const & filename, bool write)
 	}
 
 	if (!write) {
-		lyx_gui::register_socket_callback(fd, boost::bind(&LyXComm::read_ready, *this));
+		lyx_gui::register_socket_callback(fd, boost::bind(&LyXComm::read_ready, this));
 	}
 
 	return fd;
@@ -355,6 +354,18 @@ void LyXComm::send(string const & msg)
 }
 
 
+string const LyXComm::inPipeName() const
+{
+	return pipename + string(".in");
+}
+
+
+string const LyXComm::outPipeName() const
+{
+	return pipename + string(".out");
+}
+
+
 // LyXServer class
 
 LyXServer::~LyXServer()