Skip to content

Commit

Permalink
Fix remaining "void function returning a value" warning by MSVC.
Browse files Browse the repository at this point in the history
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 <[email protected]>
Acked-by: Ben Pfaff <[email protected]>
  • Loading branch information
shettyg committed Sep 15, 2014
1 parent b816a95 commit 355ead6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion lib/ofp-actions.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion ovsdb/query.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 355ead6

Please sign in to comment.