Changeset ca1fc33a

Timestamp:

Dec 11, 2008, 4:37:41 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

58d1f8a

Parents:

86bf047

Message:

Nit: Make indentation a consistent 2 spaces

File:

• select.c (modified) (1 diff)

select.c

@@ -4 +4 @@
 
 int _owl_select_timer_cmp(owl_timer *t1, owl_timer *t2, void *data) {
-    return t1->time - t2->time;
+  return t1->time - t2->time;
 }
 
 int _owl_select_timer_eq(owl_timer *t1, owl_timer *t2, void *data) {
-    return t1 == t2;
+  return t1 == t2;
 }
 
 owl_timer *owl_select_add_timer(int after, int interval, void (*cb)(struct _owl_timer *, void *), void *data)
 {
-    owl_timer *t = owl_malloc(sizeof(owl_timer));
-    GSequence *timers = owl_global_get_timerlist(&g);
-
-    t->time = time(NULL) + after;
-    t->interval = interval;
-    t->callback = cb;
-    t->data = data;
-
-    g_sequence_insert_sorted(timers, t,
-                             (GCompareDataFunc)_owl_select_timer_cmp, NULL);
-    return t;
+  owl_timer *t = owl_malloc(sizeof(owl_timer));
+  GSequence *timers = owl_global_get_timerlist(&g);
+
+  t->time = time(NULL) + after;
+  t->interval = interval;
+  t->callback = cb;
+  t->data = data;
+
+  g_sequence_insert_sorted(timers, t,
+                           (GCompareDataFunc)_owl_select_timer_cmp, NULL);
+  return t;
 }
 
 void owl_select_remove_timer(owl_timer *t)
 {
-    GSequenceIter *it = g_sequence_search(owl_global_get_timerlist(&g),
-                                          t, (GCompareDataFunc)_owl_select_timer_eq, NULL);
-    if(!g_sequence_iter_is_end(it) &&
-       g_sequence_get(it) == t) {
-        owl_free(t);
-        g_sequence_remove(it);
-    }
+  GSequenceIter *it = g_sequence_search(owl_global_get_timerlist(&g),
+                                        t, (GCompareDataFunc)_owl_select_timer_eq, NULL);
+  if(!g_sequence_iter_is_end(it) &&
+     g_sequence_get(it) == t) {
+    owl_free(t);
+    g_sequence_remove(it);
+  }
 }
 
 void owl_select_process_timers(struct timeval *timeout)
 {
-    time_t now = time(NULL);
-    GSequenceIter *it = g_sequence_get_begin_iter(owl_global_get_timerlist(&g));
-
-    while(!g_sequence_iter_is_end(it)) {
-        owl_timer *t = g_sequence_get(it);
-        void (*cb)(struct _owl_timer *, void *);
-        void *data;
-
-        if(t->time > now)
-            break;
-
-        cb = t->callback;
-        data = t->data;
-
-        /* Reschedule if appropriate */
-        if(t->interval > 0) {
-          t->time = now + t->interval;
-          g_sequence_sort_changed(it, (GCompareDataFunc)_owl_select_timer_cmp, NULL);
-        } else {
-          owl_select_remove_timer(t);
-          t = NULL;
-        }
-
-        /* Do the callback */
-        cb(t, data);
-
-        it = g_sequence_get_begin_iter(owl_global_get_timerlist(&g));
-    }
-
-    if(g_sequence_iter_is_end(it)) {
-        timeout->tv_sec = 60;
+  time_t now = time(NULL);
+  GSequenceIter *it = g_sequence_get_begin_iter(owl_global_get_timerlist(&g));
+
+  while(!g_sequence_iter_is_end(it)) {
+    owl_timer *t = g_sequence_get(it);
+    void (*cb)(struct _owl_timer *, void *);
+    void *data;
+
+    if(t->time > now)
+      break;
+
+    cb = t->callback;
+    data = t->data;
+
+    /* Reschedule if appropriate */
+    if(t->interval > 0) {
+      t->time = now + t->interval;
+      g_sequence_sort_changed(it, (GCompareDataFunc)_owl_select_timer_cmp, NULL);
     } else {
-        owl_timer *t = g_sequence_get(it);
-        timeout->tv_sec = t->time - now;
-    }
-
-    timeout->tv_usec = 0;
+      owl_select_remove_timer(t);
+      t = NULL;
+    }
+
+    /* Do the callback */
+    cb(t, data);
+
+    it = g_sequence_get_begin_iter(owl_global_get_timerlist(&g));
+  }
+
+  if(g_sequence_iter_is_end(it)) {
+    timeout->tv_sec = 60;
+  } else {
+    owl_timer *t = g_sequence_get(it);
+    timeout->tv_sec = t->time - now;
+  }
+
+  timeout->tv_usec = 0;
 }