Skip to content

Commit

Permalink
treewide: Remove pointless "return;" at ends of functions.
Browse files Browse the repository at this point in the history
Found with:
    git ls-files | xargs pcregrep -n -M 'return;\n*}'

Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Darrell Ball <dlu998@gmail.com>
Tested-by: Darrell Ball <dlu998@gmail.com>
  • Loading branch information
blp committed Jul 10, 2018
1 parent a9f5578 commit f512915
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 25 deletions.
1 change: 0 additions & 1 deletion datapath-windows/ovsext/Driver.c
Expand Up @@ -201,5 +201,4 @@ OvsExtStatus(NDIS_HANDLE filterModuleContext,
POVS_SWITCH_CONTEXT switchObject = (POVS_SWITCH_CONTEXT)filterModuleContext;

NdisFIndicateStatus(switchObject->NdisFilterHandle, statusIndication);
return;
}
6 changes: 0 additions & 6 deletions datapath-windows/ovsext/IpHelper.c
Expand Up @@ -565,8 +565,6 @@ OvsUpdateIpInterfaceNotification(PMIB_IPINTERFACE_ROW ipRow)
ExReleaseResourceLite(&instance->lock);
}
ExReleaseResourceLite(&ovsInstanceListLock);

return;
}

static VOID
Expand Down Expand Up @@ -672,8 +670,6 @@ OvsAddIpInterfaceNotification(PMIB_IPINTERFACE_ROW ipRow)
OvsIpHelperDeleteInstance(instance);
}
}

return;
}

static VOID
Expand Down Expand Up @@ -713,8 +709,6 @@ OvsRemoveIpInterfaceNotification(PMIB_IPINTERFACE_ROW ipRow)
OvsCleanupIpHelperRequestList();
OvsCleanupFwdTable();
}

return;
}

static VOID
Expand Down
1 change: 0 additions & 1 deletion datapath-windows/ovsext/Netlink/Netlink.c
Expand Up @@ -653,7 +653,6 @@ VOID
NlMsgAlignSize(const PNL_MSG_HDR nlh)
{
nlh->nlmsgLen = NLMSG_ALIGN(nlh->nlmsgLen);
return;
}

/*
Expand Down
1 change: 0 additions & 1 deletion datapath-windows/ovsext/Vport.c
Expand Up @@ -1219,7 +1219,6 @@ UpdateSwitchCtxWithVport(POVS_SWITCH_CONTEXT switchContext,
if (newPort) {
switchContext->numHvVports++;
}
return;
}

/*
Expand Down
4 changes: 0 additions & 4 deletions lib/conntrack.c
Expand Up @@ -2085,8 +2085,6 @@ nat_ipv6_addr_increment(struct in6_addr *ipv6_aligned, uint32_t increment)

memcpy(ipv6_hi, &addr6_64_hi, sizeof addr6_64_hi);
memcpy(ipv6_lo, &addr6_64_lo, sizeof addr6_64_lo);

return;
}

static uint32_t
Expand Down Expand Up @@ -3282,7 +3280,6 @@ handle_ftp_ctl(struct conntrack *ct, const struct conn_lookup_ctx *ctx,
uint8_t pad = dp_packet_l2_pad_size(pkt);
th->tcp_csum = csum_finish(
csum_continue(tcp_csum, th, tail - (char *) th - pad));
return;
}

static void
Expand All @@ -3296,5 +3293,4 @@ handle_tftp_ctl(struct conntrack *ct,
expectation_create(ct, conn_for_expectation->key.src.port,
conn_for_expectation,
!!(pkt->md.ct_state & CS_REPLY_DIR), false, false);
return;
}
2 changes: 0 additions & 2 deletions lib/lldp/lldpd.c
Expand Up @@ -408,8 +408,6 @@ lldpd_decode(struct lldpd *cfg, char *frame, int s,
if (!oport) {
hw->h_insert_cnt++;
}

return;
}

static void
Expand Down
1 change: 0 additions & 1 deletion lib/netdev-native-tnl.c
Expand Up @@ -614,7 +614,6 @@ netdev_erspan_push_header(const struct netdev *netdev,
md2 = ALIGNED_CAST(struct erspan_md2 *, ersh + 1);
put_16aligned_be32(&md2->timestamp, get_erspan_ts(ERSPAN_100US));
}
return;
}

int
Expand Down
6 changes: 0 additions & 6 deletions tests/test-aa.c
Expand Up @@ -47,8 +47,6 @@ check_received_port(struct lldpd_port *sport,
assert(rport->p_id_len == sport->p_id_len);
assert(strncmp(rport->p_id, sport->p_id, sport->p_id_len) == 0);
assert(strcmp(rport->p_descr, sport->p_descr) == 0);

return;
}


Expand All @@ -66,8 +64,6 @@ check_received_chassis(struct lldpd_chassis *schassis,
assert(strcmp(rchassis->c_descr, schassis->c_descr) == 0);
assert(rchassis->c_cap_available == schassis->c_cap_available);
assert(rchassis->c_cap_enabled == schassis->c_cap_enabled);

return;
}


Expand Down Expand Up @@ -113,8 +109,6 @@ check_received_aa(struct lldpd_port *sport,
i++;
}
assert(i == 2);

return;
}


Expand Down
3 changes: 0 additions & 3 deletions tests/test-ovsdb.c
Expand Up @@ -2624,7 +2624,6 @@ do_idl_partial_update_map_column(struct ovs_cmdl_context *ctx)

ovsdb_idl_destroy(idl);
printf("%03d: End test\n", step);
return;
}

static void
Expand Down Expand Up @@ -2744,7 +2743,6 @@ do_idl_partial_update_set_column(struct ovs_cmdl_context *ctx)
dump_simple3(idl, myRow, step++);
ovsdb_idl_destroy(idl);
printf("%03d: End test\n", step);
return;
}

static void
Expand Down Expand Up @@ -2817,7 +2815,6 @@ do_idl_compound_index_with_ref(struct ovs_cmdl_context *ctx)

ovsdb_idl_destroy(idl);
printf("%03d: End test\n", step);
return;
}


Expand Down

0 comments on commit f512915

Please sign in to comment.