[asterisk-commits] russell: branch russell/heap r176213 - in /team/russell/heap: include/asteris...

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Feb 16 14:57:36 2009
New Revision: 176213

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=176213
Log:
Death to trailing whitespace

Modified:
    team/russell/heap/include/asterisk/heap.h
    team/russell/heap/main/heap.c
    team/russell/heap/main/sched.c
    team/russell/heap/tests/test_heap.c

Modified: team/russell/heap/include/asterisk/heap.h
URL: http://svn.digium.com/svn-view/asterisk/team/russell/heap/include/asterisk/heap.h?view=diff&rev=176213&r1=176212&r2=176213
==============================================================================
--- team/russell/heap/include/asterisk/heap.h (original)
+++ team/russell/heap/include/asterisk/heap.h Mon Feb 16 14:57:36 2009
@@ -128,8 +128,8 @@
  * \return an element at the specified index on the heap.  This element will _not_
  *         be removed before being returned.
  *
- * \note If this function is being used in combination with ast_heap_size() for 
- *       purposes of traversing the heap, the heap must be locked for the entire 
+ * \note If this function is being used in combination with ast_heap_size() for
+ *       purposes of traversing the heap, the heap must be locked for the entire
  *       duration of the traversal.
  */
 void *ast_heap_peek(struct ast_heap *h, unsigned int index);

Modified: team/russell/heap/main/heap.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/heap/main/heap.c?view=diff&rev=176213&r1=176212&r2=176213
==============================================================================
--- team/russell/heap/main/heap.c (original)
+++ team/russell/heap/main/heap.c Mon Feb 16 14:57:36 2009
@@ -171,7 +171,7 @@
 	void *tmp;
 
 	tmp = heap_get(h, i);
-	heap_set(h, i, heap_get(h, j));	
+	heap_set(h, i, heap_get(h, j));
 	heap_set(h, j, tmp);
 }
 
@@ -212,7 +212,7 @@
 
 	heap_set(h, ++(h->cur_len), elm);
 
-	for (i = h->cur_len; 
+	for (i = h->cur_len;
 			i > 1 && h->cmp_fn(heap_get(h, parent_node(i)), heap_get(h, i)) < 0;
 			i = parent_node(i)) {
 		heap_swap(h, i, parent_node(i));

Modified: team/russell/heap/main/sched.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/heap/main/sched.c?view=diff&rev=176213&r1=176212&r2=176213
==============================================================================
--- team/russell/heap/main/sched.c (original)
+++ team/russell/heap/main/sched.c Mon Feb 16 14:57:36 2009
@@ -235,7 +235,7 @@
 {
 	struct sched *as = a;
 	struct sched *bs = b;
-	
+
 	return ast_tvcmp(bs->when, as->when);
 }
 
@@ -248,7 +248,7 @@
 
 	ast_mutex_init(&tmp->lock);
 	tmp->eventcnt = 1;
-	
+
 	tmp->schedq_ht = ast_hashtab_create(23, sched_cmp, ast_hashtab_resize_java, ast_hashtab_newsize_java, sched_hash, 1);
 
 	if (!(tmp->sched_heap = ast_heap_create(8, sched_time_cmp,
@@ -467,7 +467,7 @@
 #endif
 {
 	struct sched *s, tmp = {
-		.id = id,	
+		.id = id,
 	};
 
 	DEBUG(ast_debug(1, "ast_sched_del(%d)\n", id));
@@ -635,7 +635,7 @@
 			}
 		} else {
 			/* No longer needed, so release it */
-		 	sched_release(con, current);
+			sched_release(con, current);
 		}
 	}
 

Modified: team/russell/heap/tests/test_heap.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/heap/tests/test_heap.c?view=diff&rev=176213&r1=176212&r2=176213
==============================================================================
--- team/russell/heap/tests/test_heap.c (original)
+++ team/russell/heap/tests/test_heap.c Mon Feb 16 14:57:36 2009
@@ -85,7 +85,7 @@
 	if (obj->val != 2) {
 		return -3;
 	}
-	
+
 	obj = ast_heap_pop(h);
 	if (obj->val != 1) {
 		return -4;
@@ -191,7 +191,7 @@
 		ast_cli(a->fd, "Test 1 failed! (%d)\n", res);
 		return CLI_FAILURE;
 	}
-	
+
 	if ((res = test2(a->fd))) {
 		ast_cli(a->fd, "Test 2 failed! (%d)\n", res);
 		return CLI_FAILURE;