From c5c7c7c5c0d379c49121d63b77067aa32bce22b7 Mon Sep 17 00:00:00 2001 From: Ethan Jackson Date: Wed, 24 Nov 2010 01:57:45 -0800 Subject: [PATCH] ovsdb: Remove trailing whitespace This commit removes trailing whitespace from the files in the ovsdb directory. --- ovsdb/SPECS | 8 ++++---- ovsdb/automake.mk | 4 ++-- ovsdb/ovsdb-doc.in | 12 ++++++------ ovsdb/ovsdb-dot.in | 4 ++-- ovsdb/ovsdb-idlc.1 | 2 +- ovsdb/ovsdb-idlc.in | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ovsdb/SPECS b/ovsdb/SPECS index 260786ed..326293c7 100644 --- a/ovsdb/SPECS +++ b/ovsdb/SPECS @@ -195,7 +195,7 @@ is represented by , as described below. "minInteger": optional, integers only "maxInteger": optional, integers only "minReal": optional, reals only - "maxReal": optional, reals only + "maxReal": optional, reals only "minLength": optional, strings only "maxLength": optional, strings only "refTable": optional, uuids only @@ -419,7 +419,7 @@ Response object members: This JSON-RPC notification instructs the database server to immediately complete or cancel the "transact" request whose "id" is -the same as the notification's "params" value. +the same as the notification's "params" value. If the "transact" request can be completed immediately, then the server sends a response in the form described for "transact", above. @@ -931,7 +931,7 @@ Semantics: column specified in "row". The "_uuid" and "_version" columns of a table may not be directly - updated with this operation. Columns designated read-only in the + updated with this operation. Columns designated read-only in the schema also may not be updated. The "count" member of the result specifies the number of rows @@ -1045,7 +1045,7 @@ Semantics: restarted later, after a change in the database makes it possible for the operation to succeed. The client will not receive a response until the operation permanently succeeds or fails. - + If "until" is "!=", the sense of the test is negated. That is, as long as the query on "table" specified by "where" and "columns" returns "rows", the transaction will be rolled back and restarted diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk index b178f3fd..1f53d201 100644 --- a/ovsdb/automake.mk +++ b/ovsdb/automake.mk @@ -59,8 +59,8 @@ DISTCLEANFILES += ovsdb/ovsdb-server.1 EXTRA_DIST += ovsdb/ovsdb-server.1.in # ovsdb-idlc -EXTRA_DIST += ovsdb/SPECS -noinst_SCRIPTS += ovsdb/ovsdb-idlc +EXTRA_DIST += ovsdb/SPECS +noinst_SCRIPTS += ovsdb/ovsdb-idlc EXTRA_DIST += \ ovsdb/ovsdb-idlc.in \ ovsdb/ovsdb-idlc.1 diff --git a/ovsdb/ovsdb-doc.in b/ovsdb/ovsdb-doc.in index 9e0a318d..5f303348 100755 --- a/ovsdb/ovsdb-doc.in +++ b/ovsdb/ovsdb-doc.in @@ -177,7 +177,7 @@ def tableSummaryToNroff(summary, level=0): s = "" for type, name, arg in summary: if type == 'column': - + s += "%s\\fB%s\\fR\tT{\n%s\nT}\n" % ( r'\ \ ' * level, name, typeAndConstraintsToNroff(arg)) else: @@ -221,11 +221,11 @@ Column Type def docsToNroff(schemaFile, xmlFile, erFile, title=None): schema = ovs.db.schema.DbSchema.from_json(ovs.json.from_file(schemaFile)) doc = xml.dom.minidom.parse(xmlFile).documentElement - + schemaDate = os.stat(schemaFile).st_mtime xmlDate = os.stat(xmlFile).st_mtime d = date.fromtimestamp(max(schemaDate, xmlDate)) - + if title == None: title = schema.name @@ -344,19 +344,19 @@ if __name__ == "__main__": print "ovsdb-doc (Open vSwitch) @VERSION@" else: sys.exit(0) - + if len(args) != 2: sys.stderr.write("%s: exactly 2 non-option arguments required " "(use --help for help)\n" % argv0) sys.exit(1) - + # XXX we should warn about undocumented tables or columns s = docsToNroff(args[0], args[1], er_diagram) for line in s.split("\n"): line = line.strip() if len(line): print line - + except error.Error, e: sys.stderr.write("%s: %s\n" % (argv0, e.msg)) sys.exit(1) diff --git a/ovsdb/ovsdb-dot.in b/ovsdb/ovsdb-dot.in index cea89879..571ac8f0 100755 --- a/ovsdb/ovsdb-dot.in +++ b/ovsdb/ovsdb-dot.in @@ -68,14 +68,14 @@ if __name__ == "__main__": print "ovsdb-dot (Open vSwitch) @VERSION@" else: sys.exit(0) - + if len(args) != 1: sys.stderr.write("%s: exactly 1 non-option argument required " "(use --help for help)\n" % argv0) sys.exit(1) schemaToDot(args[0]) - + except ovs.db.error.Error, e: sys.stderr.write("%s: %s\n" % (argv0, e.msg)) sys.exit(1) diff --git a/ovsdb/ovsdb-idlc.1 b/ovsdb/ovsdb-idlc.1 index 8d5132e8..4a332614 100644 --- a/ovsdb/ovsdb-idlc.1 +++ b/ovsdb/ovsdb-idlc.1 @@ -6,7 +6,7 @@ ovsdb\-idlc \- Open vSwitch IDL (Interface Definition Language) compiler . .SH SYNOPSIS -\fBovsdb\-idlc \fBannotate\fI schema annotations\fR +\fBovsdb\-idlc \fBannotate\fI schema annotations\fR .br \fBovsdb\-idlc \fBc\-idl\-header\fI idl\fR .br diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in index e8371aa1..c6870cc3 100755 --- a/ovsdb/ovsdb-idlc.in +++ b/ovsdb/ovsdb-idlc.in @@ -310,7 +310,7 @@ static void { /* Nothing to do. */ }''' % {'s': structName, 'c': columnName} - + # First, next functions. print ''' const struct %(s)s * @@ -566,7 +566,7 @@ if __name__ == "__main__": except getopt.GetoptError, geo: sys.stderr.write("%s: %s\n" % (argv0, geo.msg)) sys.exit(1) - + for key, value in options: if key in ['-h', '--help']: usage() @@ -576,7 +576,7 @@ if __name__ == "__main__": os.chdir(value) else: sys.exit(0) - + optKeys = [key for key, value in options] if not args: -- 2.30.2