Looks Good. On Tue, Feb 8, 2011 at 10:30 AM, Ben Pfaff <[email protected]> wrote: > On Mon, Feb 07, 2011 at 06:46:28PM -0800, Ethan Jackson wrote: >> > +static bool is_condition_satified(const struct vsctl_table_class *, >> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?const struct ovsdb_idl_row *, >> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?const char *arg, >> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?struct ovsdb_symbol_table *); >> > + >> >> Perhaps now would be an appropriate time to add another commit which >> changes the spelling of is_condition_satified (or perhaps doing it in >> this commit is fine). That said, since it was spelled incorrectly in >> a previous commit I don't think it should block merging this one. > > I hadn't even noticed the misspelling. I added the following commit at > the top of this series and fixed up this one to match: > > --8<--------------------------cut here-------------------------->8-- > > From: Ben Pfaff <[email protected]> > Date: Tue, 8 Feb 2011 10:21:10 -0800 > Subject: [PATCH] ovs-vsctl: Fix spelling of "satisfied" in function name. > > Suggested-by: Ethan Jackson <[email protected]> > --- > utilities/ovs-vsctl.c | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c > index 911d8fe..d70cb79 100644 > --- a/utilities/ovs-vsctl.c > +++ b/utilities/ovs-vsctl.c > @@ -1,5 +1,5 @@ > /* > - * Copyright (c) 2009, 2010, 2011 Nicira Networks. > + * Copyright (c) 2009, 2010, 2011 Nicira Networks. > * > * Licensed under the Apache License, Version 2.0 (the "License"); > * you may not use this file except in compliance with the License. > @@ -3026,9 +3026,9 @@ cmd_destroy(struct vsctl_context *ctx) > } > > static bool > -is_condition_satified(const struct vsctl_table_class *table, > - const struct ovsdb_idl_row *row, const char *arg, > - struct ovsdb_symbol_table *symtab) > +is_condition_satisfied(const struct vsctl_table_class *table, > + const struct ovsdb_idl_row *row, const char *arg, > + struct ovsdb_symbol_table *symtab) > { > static const char *operators[] = { > "=", "!=", "<", ">", "<=", ">=" > @@ -3130,7 +3130,7 @@ cmd_wait_until(struct vsctl_context *ctx) > } > > for (i = 3; i < ctx->argc; i++) { > - if (!is_condition_satified(table, row, ctx->argv[i], ctx->symtab)) { > + if (!is_condition_satisfied(table, row, ctx->argv[i], ctx->symtab)) { > ctx->try_again = true; > return; > } > -- > 1.7.1 > >
_______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev_openvswitch.org
