From 355ead69010c123475a9d2ade23b1cc667d868cb Mon Sep 17 00:00:00 2001 From: Gurucharan Shetty Date: Mon, 15 Sep 2014 10:04:32 -0700 Subject: [PATCH] Fix remaining "void function returning a value" warning by MSVC. MSVC complains about a void function returning a value if there is a statement of the form - 'return foo()' even if foo() has a void return type. Signed-off-by: Gurucharan Shetty Acked-by: Ben Pfaff --- lib/ofp-actions.c | 3 ++- ovsdb/query.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index 0a5045a5c..5df36a200 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -5310,7 +5310,8 @@ encode_ofpact(const struct ofpact *a, enum ofp_version ofp_version, switch (a->type) { #define OFPACT(ENUM, STRUCT, MEMBER, NAME) \ case OFPACT_##ENUM: \ - return encode_##ENUM(ofpact_get_##ENUM(a), ofp_version, out); + encode_##ENUM(ofpact_get_##ENUM(a), ofp_version, out); \ + return; OFPACTS #undef OFPACT default: diff --git a/ovsdb/query.c b/ovsdb/query.c index 7f6eccd7d..e28802088 100644 --- a/ovsdb/query.c +++ b/ovsdb/query.c @@ -81,7 +81,8 @@ ovsdb_query_distinct(struct ovsdb_table *table, { if (!columns || ovsdb_column_set_contains(columns, OVSDB_COL_UUID)) { /* All the result rows are guaranteed to be distinct anyway. */ - return ovsdb_query_row_set(table, condition, results); + ovsdb_query_row_set(table, condition, results); + return; } else { /* Use hash table to drop duplicates. */ struct ovsdb_row_hash_node *node; -- 2.20.1