[asterisk-commits] russell: branch 1.6.1 r197969 - in /branches/1.6.1: ./ res/res_timing_pthread.c

[SVN commits to the Asterisk project]

Author: russell
Date: Fri May 29 11:19:55 2009
New Revision: 197969

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=197969
Log:
Merged revisions 197960 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r197960 | russell | 2009-05-29 11:15:30 -0500 (Fri, 29 May 2009) | 2 lines
  
  Trim trailing whitespace so that I can work on this bug without it bothering me.  :-)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_timing_pthread.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/res/res_timing_pthread.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/res/res_timing_pthread.c?view=diff&rev=197969&r1=197968&r2=197969
==============================================================================
--- branches/1.6.1/res/res_timing_pthread.c (original)
+++ branches/1.6.1/res/res_timing_pthread.c Fri May 29 11:19:55 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;
 	}