aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar David G. Quintas <dgq@google.com>2016-06-08 01:43:19 -0400
committerGravatar David G. Quintas <dgq@google.com>2016-06-08 01:43:19 -0400
commit2c57371b937e6ac37b2d331a817bb7f1e33b5383 (patch)
tree2e02d84fc28a82eddc10835d42029793f7eebb6c
parentd30d4e279c4a63effaa6e912fc00bd4ad96054c7 (diff)
parentdfff4de040086d68bbdabf2d4a0c427b55987ebd (diff)
Merge pull request #6832 from grpc/sed-f-up-fix
Fix sed induced typo
-rw-r--r--src/core/lib/iomgr/timer.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/lib/iomgr/timer.c b/src/core/lib/iomgr/timer.c
index 05a2fc104f..69d3babfdb 100644
--- a/src/core/lib/iomgr/timer.c
+++ b/src/core/lib/iomgr/timer.c
@@ -278,9 +278,8 @@ static int refill_queue(shard_type *shard, gpr_timespec now) {
return !grpc_timer_heap_is_empty(&shard->heap);
}
-/* This pollent the next non-cancelled timer with deadline <= now from the
- queue,
- or returns NULL if there isn't one.
+/* This pops the next non-cancelled timer with deadline <= now from the
+ queue, or returns NULL if there isn't one.
REQUIRES: shard->mu locked */
static grpc_timer *pop_one(shard_type *shard, gpr_timespec now) {
grpc_timer *timer;