[asterisk-commits] russell: trunk r197960 - /trunk/res/res_timing_pthread.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri May 29 11:15:34 CDT 2009
Author: russell
Date: Fri May 29 11:15:30 2009
New Revision: 197960
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=197960
Log:
Trim trailing whitespace so that I can work on this bug without it bothering me. :-)
Modified:
trunk/res/res_timing_pthread.c
Modified: trunk/res/res_timing_pthread.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/res/res_timing_pthread.c?view=diff&rev=197960&r1=197959&r2=197960
==============================================================================
--- trunk/res/res_timing_pthread.c (original)
+++ trunk/res/res_timing_pthread.c Fri May 29 11:15:30 2009
@@ -16,11 +16,11 @@
* at the top of the source tree.
*/
-/*!
+/*!
* \file
* \author Russell Bryant <russell at digium.com>
*
- * \brief pthread timing interface
+ * \brief pthread timing interface
*/
#include "asterisk.h"
@@ -186,7 +186,7 @@
if (timer->state != TIMER_STATE_CONTINUOUS) {
set_state(timer);
}
-
+
ao2_unlock(timer);
ao2_ref(timer, -1);
@@ -311,7 +311,7 @@
}
/*!
- * \note only PIPE_READ is guaranteed valid
+ * \note only PIPE_READ is guaranteed valid
*/
static int pthread_timer_hash(const void *obj, const int flags)
{
@@ -321,7 +321,7 @@
}
/*!
- * \note only PIPE_READ is guaranteed valid
+ * \note only PIPE_READ is guaranteed valid
*/
static int pthread_timer_cmp(void *obj, void *arg, int flags)
{
@@ -339,9 +339,9 @@
struct timeval now;
if (timer->state == TIMER_STATE_IDLE || timer->state == TIMER_STATE_CONTINUOUS) {
- return 0;
- }
-
+ return 0;
+ }
+
now = ast_tvnow();
if (timer->tick_count < (ast_tvdiff_ms(now, timer->start) / timer->interval)) {
@@ -379,7 +379,7 @@
break;
}
- res = read(rd_fd, buf,
+ res = read(rd_fd, buf,
(quantity < sizeof(buf)) ? quantity : sizeof(buf));
if (res == -1) {
@@ -404,7 +404,7 @@
ssize_t res;
unsigned char x = 42;
- res = write(wr_fd, &x, 1);
+ res = write(wr_fd, &x, 1);
if (res == -1) {
if (errno == EAGAIN) {
@@ -428,7 +428,7 @@
if (check_timer(timer)) {
write_byte(timer->pipe[PIPE_WRITE]);
}
-
+
ao2_unlock(timer);
return 0;
@@ -477,7 +477,7 @@
static int load_module(void)
{
- if (!(pthread_timers = ao2_container_alloc(PTHREAD_TIMER_BUCKETS,
+ if (!(pthread_timers = ao2_container_alloc(PTHREAD_TIMER_BUCKETS,
pthread_timer_hash, pthread_timer_cmp))) {
return AST_MODULE_LOAD_DECLINE;
}
More information about the asterisk-commits
mailing list