You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
62 lines
1.7 KiB
62 lines
1.7 KiB
Description: cast return values to error_t
|
|
Author: Alf Gaida <agaida@siduction.org>
|
|
|
|
Bug: <url in upstream bugtracker>
|
|
Last-Update: 2015-12-27
|
|
|
|
--- lxqt-globalkeys-0.10.0.orig/daemon/pipe_utils.cpp
|
|
+++ lxqt-globalkeys-0.10.0/daemon/pipe_utils.cpp
|
|
@@ -39,10 +39,10 @@ void initBothPipeEnds(int fd[2])
|
|
|
|
error_t createPipe(int fd[2])
|
|
{
|
|
- error_t result = 0;
|
|
+ error_t result = static_cast<error_t>(0);
|
|
if (pipe(fd) < 0)
|
|
{
|
|
- result = errno;
|
|
+ result = static_cast<error_t>( errno);
|
|
}
|
|
if (!result)
|
|
{
|
|
@@ -59,16 +59,16 @@ error_t readAll(int fd, void *data, size
|
|
ssize_t bytes_read = read(fd, data, length);
|
|
if (bytes_read < 0)
|
|
{
|
|
- return errno;
|
|
+ return static_cast<error_t>( errno);
|
|
}
|
|
if (!bytes_read)
|
|
{
|
|
- return -1;
|
|
+ return static_cast<error_t>( -1);
|
|
}
|
|
data = reinterpret_cast<char *>(data) + bytes_read;
|
|
length -= bytes_read;
|
|
}
|
|
- return 0;
|
|
+ return static_cast<error_t>(0);
|
|
}
|
|
|
|
error_t writeAll(int fd, const void *data, size_t length)
|
|
@@ -78,16 +78,16 @@ error_t writeAll(int fd, const void *dat
|
|
ssize_t bytes_written = write(fd, data, length);
|
|
if (bytes_written < 0)
|
|
{
|
|
- return errno;
|
|
+ return static_cast<error_t>( errno);
|
|
}
|
|
if (!bytes_written)
|
|
{
|
|
- return -1;
|
|
+ return static_cast<error_t>( -1);
|
|
}
|
|
data = reinterpret_cast<const char *>(data) + bytes_written;
|
|
length -= bytes_written;
|
|
}
|
|
- return 0;
|
|
+ return static_cast<error_t>( 0);
|
|
}
|
|
|
|
void closeBothPipeEnds(int fd[2])
|