[glib/wip/nacho/gpoll: 7/8] gpoll: rename timeout to timeout_ms for clarity
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/nacho/gpoll: 7/8] gpoll: rename timeout to timeout_ms for clarity
- Date: Wed, 19 Dec 2018 11:28:50 +0000 (UTC)
commit ddd1f242d4c0ee13187600e33a16cdd75581a001
Author: Ignacio Casal Quinteiro <qignacio amazon com>
Date: Wed Dec 19 12:18:39 2018 +0100
gpoll: rename timeout to timeout_ms for clarity
glib/gpoll.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/glib/gpoll.c b/glib/gpoll.c
index 5f46906ba..1f25432ab 100644
--- a/glib/gpoll.c
+++ b/glib/gpoll.c
@@ -133,7 +133,7 @@ poll_rest (GPollFD *msg_fd,
HANDLE *handles,
GPollFD *handle_to_fd[],
gint nhandles,
- gint timeout)
+ gint timeout_ms)
{
DWORD ready;
GPollFD *f;
@@ -145,9 +145,9 @@ poll_rest (GPollFD *msg_fd,
* -> Use MsgWaitForMultipleObjectsEx
*/
if (_g_main_poll_debug)
- g_print (" MsgWaitForMultipleObjectsEx(%d, %d)\n", nhandles, timeout);
+ g_print (" MsgWaitForMultipleObjectsEx(%d, %d)\n", nhandles, timeout_ms);
- ready = MsgWaitForMultipleObjectsEx (nhandles, handles, timeout,
+ ready = MsgWaitForMultipleObjectsEx (nhandles, handles, timeout_ms,
QS_ALLINPUT, MWMO_ALERTABLE);
if (ready == WAIT_FAILED)
@@ -160,12 +160,12 @@ poll_rest (GPollFD *msg_fd,
else if (nhandles == 0)
{
/* No handles to wait for, just the timeout */
- if (timeout == INFINITE)
+ if (timeout_ms == INFINITE)
ready = WAIT_FAILED;
else
{
/* Wait for the current process to die, more efficient than SleepEx(). */
- WaitForSingleObjectEx (GetCurrentProcess (), timeout, TRUE);
+ WaitForSingleObjectEx (GetCurrentProcess (), timeout_ms, TRUE);
ready = WAIT_TIMEOUT;
}
}
@@ -175,9 +175,9 @@ poll_rest (GPollFD *msg_fd,
* -> Use WaitForMultipleObjectsEx
*/
if (_g_main_poll_debug)
- g_print (" WaitForMultipleObjectsEx(%d, %d)\n", nhandles, timeout);
+ g_print (" WaitForMultipleObjectsEx(%d, %d)\n", nhandles, timeout_ms);
- ready = WaitForMultipleObjectsEx (nhandles, handles, FALSE, timeout, TRUE);
+ ready = WaitForMultipleObjectsEx (nhandles, handles, FALSE, timeout_ms, TRUE);
if (ready == WAIT_FAILED)
{
gchar *emsg = g_win32_error_message (GetLastError ());
@@ -205,7 +205,7 @@ poll_rest (GPollFD *msg_fd,
/* If we have a timeout, or no handles to poll, be satisfied
* with just noticing we have messages waiting.
*/
- if (timeout != 0 || nhandles == 0)
+ if (timeout_ms != 0 || nhandles == 0)
return 1;
/* If no timeout and handles to poll, recurse to poll them,
@@ -224,7 +224,7 @@ poll_rest (GPollFD *msg_fd,
/* If no timeout and polling several handles, recurse to poll
* the rest of them.
*/
- if (timeout == 0 && nhandles > 1)
+ if (timeout_ms == 0 && nhandles > 1)
{
/* Poll the handles with index > ready */
HANDLE *shorter_handles;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]