2
0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00

treewide: Change doubled ";;" to single ";" in C code.

Except in "for (;;)".

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Russell Bryant <rbryant@redhat.com>
This commit is contained in:
Ben Pfaff
2015-07-22 08:30:15 -07:00
parent 9b0b57ca15
commit ea53e3a86d
6 changed files with 8 additions and 8 deletions

View File

@@ -388,7 +388,7 @@ dummy_packet_conn_set_config(struct dummy_packet_conn *conn,
if (stream) { if (stream) {
int error; int error;
struct stream *active_stream; struct stream *active_stream;
struct reconnect *reconnect;; struct reconnect *reconnect;
reconnect = reconnect_create(time_msec()); reconnect = reconnect_create(time_msec());
reconnect_set_name(reconnect, stream); reconnect_set_name(reconnect, stream);

View File

@@ -98,7 +98,7 @@ syslog_direct_log(struct syslogger *this, int pri, const char *msg)
} }
ds_put_format(&ds, "<%u>%s", pri, msg); ds_put_format(&ds, "<%u>%s", pri, msg);
wire_msg = ds_cstr(&ds); wire_msg = ds_cstr(&ds);
send_len = MIN(strlen(wire_msg), max_len);; send_len = MIN(strlen(wire_msg), max_len);
while (send(this_->fd, wire_msg, send_len, 0) < 0 && errno == EMSGSIZE) { while (send(this_->fd, wire_msg, send_len, 0) < 0 && errno == EMSGSIZE) {
/* If message was too large for send() function then try to discover /* If message was too large for send() function then try to discover
* max_len supported for this particular socket and retry sending a * max_len supported for this particular socket and retry sending a

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2015 Nicira, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -811,7 +811,7 @@ vlog_get_patterns(void)
ds_put_format(&ds, " ------ ------\n"); ds_put_format(&ds, " ------ ------\n");
for (destination = 0; destination < VLF_N_DESTINATIONS; destination++) { for (destination = 0; destination < VLF_N_DESTINATIONS; destination++) {
struct destination *f = &destinations[destination];; struct destination *f = &destinations[destination];
const char *prefix = "none"; const char *prefix = "none";
if (destination == VLF_SYSLOG && syslogger) { if (destination == VLF_SYSLOG && syslogger) {

View File

@@ -417,7 +417,7 @@ connmgr_get_memory_usage(const struct connmgr *mgr, struct simap *usage)
struct pinsched_stats stats; struct pinsched_stats stats;
pinsched_get_stats(ofconn->schedulers[i], &stats); pinsched_get_stats(ofconn->schedulers[i], &stats);
packets += stats.n_queued;; packets += stats.n_queued;
} }
packets += pktbuf_count_packets(ofconn->pktbuf); packets += pktbuf_count_packets(ofconn->pktbuf);
} }

View File

@@ -6929,7 +6929,7 @@ handle_bundle_control(struct ofconn *ofconn, const struct ofp_header *oh)
break; break;
case OFPBCT_CLOSE_REQUEST: case OFPBCT_CLOSE_REQUEST:
error = ofp_bundle_close(ofconn, bctrl.bundle_id, bctrl.flags); error = ofp_bundle_close(ofconn, bctrl.bundle_id, bctrl.flags);
reply.type = OFPBCT_CLOSE_REPLY;; reply.type = OFPBCT_CLOSE_REPLY;
break; break;
case OFPBCT_COMMIT_REQUEST: case OFPBCT_COMMIT_REQUEST:
error = do_bundle_commit(ofconn, bctrl.bundle_id, bctrl.flags); error = do_bundle_commit(ofconn, bctrl.bundle_id, bctrl.flags);

View File

@@ -29,10 +29,10 @@ struct simap;
char *actions_parse(struct lexer *, const struct shash *symtab, char *actions_parse(struct lexer *, const struct shash *symtab,
const struct simap *ports, uint8_t next_table_id, const struct simap *ports, uint8_t next_table_id,
struct ofpbuf *ofpacts, struct expr **prereqsp) struct ofpbuf *ofpacts, struct expr **prereqsp)
OVS_WARN_UNUSED_RESULT;; OVS_WARN_UNUSED_RESULT;
char *actions_parse_string(const char *s, const struct shash *symtab, char *actions_parse_string(const char *s, const struct shash *symtab,
const struct simap *ports, uint8_t next_table_id, const struct simap *ports, uint8_t next_table_id,
struct ofpbuf *ofpacts, struct expr **prereqsp) struct ofpbuf *ofpacts, struct expr **prereqsp)
OVS_WARN_UNUSED_RESULT;; OVS_WARN_UNUSED_RESULT;
#endif /* ovn/actions.h */ #endif /* ovn/actions.h */