Address clint warnings and other style issues.

* Add const.
* Fix conditions (move && from end to start of line).
* Use int32_t instead of long.
* Use //-style comments.
This commit is contained in:
Thomas Wienecke
2014-03-27 13:04:26 +01:00
committed by Thiago de Arruda
parent 5762c4e528
commit 4e29a820b6
12 changed files with 160 additions and 252 deletions

View File

@@ -13,23 +13,23 @@ static void timer_prepare_cb(uv_prepare_t *, int);
void event_init()
{
/* Initialize input events */
// Initialize input events
input_init();
/* Timer to wake the event loop if a timeout argument is passed to
* `event_poll` */
// Timer to wake the event loop if a timeout argument is passed to
// `event_poll`
uv_timer_init(uv_default_loop(), &timer);
/* This prepare handle that actually starts the timer */
// This prepare handle that actually starts the timer
uv_prepare_init(uv_default_loop(), &timer_prepare);
}
/* Wait for some event */
// Wait for some event
bool event_poll(int32_t ms)
{
bool timed_out;
uv_run_mode run_mode = UV_RUN_ONCE;
if (input_ready()) {
/* If there's a pending input event to be consumed, do it now */
// If there's a pending input event to be consumed, do it now
return true;
}
@@ -37,42 +37,39 @@ bool event_poll(int32_t ms)
timed_out = false;
if (ms > 0) {
/* Timeout passed as argument to the timer */
// Timeout passed as argument to the timer
timer.data = &timed_out;
/* We only start the timer after the loop is running, for that we
* use an prepare handle(pass the interval as data to it) */
// We only start the timer after the loop is running, for that we
// use an prepare handle(pass the interval as data to it)
timer_prepare.data = &ms;
uv_prepare_start(&timer_prepare, timer_prepare_cb);
} else if (ms == 0) {
/*
* For ms == 0, we need to do a non-blocking event poll by
* setting the run mode to UV_RUN_NOWAIT.
*/
// For ms == 0, we need to do a non-blocking event poll by
// setting the run mode to UV_RUN_NOWAIT.
run_mode = UV_RUN_NOWAIT;
}
do {
/* Run one event loop iteration, blocking for events if run_mode is
* UV_RUN_ONCE */
// Run one event loop iteration, blocking for events if run_mode is
// UV_RUN_ONCE
uv_run(uv_default_loop(), run_mode);
} while (
/* Continue running if ... */
!input_ready() && /* ... we have no input */
run_mode != UV_RUN_NOWAIT && /* ... ms != 0 */
!timed_out /* ... we didn't get a timeout */
);
// Continue running if ...
!input_ready() // ... we have no input
&& run_mode != UV_RUN_NOWAIT // ... ms != 0
&& !timed_out); // ... we didn't get a timeout
input_stop();
if (ms > 0) {
/* Stop the timer */
// Stop the timer
uv_timer_stop(&timer);
}
return input_ready();
}
/* Set a flag in the `event_poll` loop for signaling of a timeout */
// Set a flag in the `event_poll` loop for signaling of a timeout
static void timer_cb(uv_timer_t *handle, int status)
{
*((bool *)handle->data) = true;