summaryrefslogtreecommitdiff
path: root/ovsdb/trigger.c
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2010-09-17 10:33:10 -0700
committerBen Pfaff <blp@nicira.com>2010-10-01 10:25:29 -0700
commit4e8e4213a815a30216e855a805a8bcd5b8c5a886 (patch)
tree38dbb503be4f22ae804f3e5f83459c975d83886a /ovsdb/trigger.c
parentadf7cfd851c3d9d6f1ad74653cbd2fecce8c3ba9 (diff)
downloadopenvswitch-4e8e4213a815a30216e855a805a8bcd5b8c5a886.tar.gz
Switch many macros from using CONTAINER_OF to using OBJECT_CONTAINING.
These macros require one fewer argument by switching, which makes code that uses them shorter and more readable.
Diffstat (limited to 'ovsdb/trigger.c')
-rw-r--r--ovsdb/trigger.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ovsdb/trigger.c b/ovsdb/trigger.c
index 47719698c..c222d895c 100644
--- a/ovsdb/trigger.c
+++ b/ovsdb/trigger.c
@@ -73,7 +73,7 @@ ovsdb_trigger_run(struct ovsdb *db, long long int now)
run_triggers = db->run_triggers;
db->run_triggers = false;
- LIST_FOR_EACH_SAFE (t, next, struct ovsdb_trigger, node, &db->triggers) {
+ LIST_FOR_EACH_SAFE (t, next, node, &db->triggers) {
if (run_triggers || now - t->created >= t->timeout_msec) {
ovsdb_trigger_try(db, t, now);
}
@@ -89,7 +89,7 @@ ovsdb_trigger_wait(struct ovsdb *db, long long int now)
long long int deadline = LLONG_MAX;
struct ovsdb_trigger *t;
- LIST_FOR_EACH (t, struct ovsdb_trigger, node, &db->triggers) {
+ LIST_FOR_EACH (t, node, &db->triggers) {
if (t->created < LLONG_MAX - t->timeout_msec) {
long long int t_deadline = t->created + t->timeout_msec;
if (deadline > t_deadline) {