From ea53e3a86d75cdbb30033bf8a737baf86c5891bb Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 22 Jul 2015 08:30:15 -0700 Subject: [PATCH 1/1] treewide: Change doubled ";;" to single ";" in C code. Except in "for (;;)". Signed-off-by: Ben Pfaff Acked-by: Russell Bryant --- lib/netdev-dummy.c | 2 +- lib/syslog-direct.c | 2 +- lib/vlog.c | 4 ++-- ofproto/connmgr.c | 2 +- ofproto/ofproto.c | 2 +- ovn/lib/actions.h | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index c8072b6aa..285f5448c 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -388,7 +388,7 @@ dummy_packet_conn_set_config(struct dummy_packet_conn *conn, if (stream) { int error; struct stream *active_stream; - struct reconnect *reconnect;; + struct reconnect *reconnect; reconnect = reconnect_create(time_msec()); reconnect_set_name(reconnect, stream); diff --git a/lib/syslog-direct.c b/lib/syslog-direct.c index 6bc074981..f41d881e3 100644 --- a/lib/syslog-direct.c +++ b/lib/syslog-direct.c @@ -98,7 +98,7 @@ syslog_direct_log(struct syslogger *this, int pri, const char *msg) } ds_put_format(&ds, "<%u>%s", pri, msg); 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) { /* If message was too large for send() function then try to discover * max_len supported for this particular socket and retry sending a diff --git a/lib/vlog.c b/lib/vlog.c index 09351a806..29ba62082 100644 --- a/lib/vlog.c +++ b/lib/vlog.c @@ -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"); * 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"); for (destination = 0; destination < VLF_N_DESTINATIONS; destination++) { - struct destination *f = &destinations[destination];; + struct destination *f = &destinations[destination]; const char *prefix = "none"; if (destination == VLF_SYSLOG && syslogger) { diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c index 975ee335b..302d9cea6 100644 --- a/ofproto/connmgr.c +++ b/ofproto/connmgr.c @@ -417,7 +417,7 @@ connmgr_get_memory_usage(const struct connmgr *mgr, struct simap *usage) struct pinsched_stats stats; pinsched_get_stats(ofconn->schedulers[i], &stats); - packets += stats.n_queued;; + packets += stats.n_queued; } packets += pktbuf_count_packets(ofconn->pktbuf); } diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 6d60bfb39..616c04c47 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -6929,7 +6929,7 @@ handle_bundle_control(struct ofconn *ofconn, const struct ofp_header *oh) break; case OFPBCT_CLOSE_REQUEST: error = ofp_bundle_close(ofconn, bctrl.bundle_id, bctrl.flags); - reply.type = OFPBCT_CLOSE_REPLY;; + reply.type = OFPBCT_CLOSE_REPLY; break; case OFPBCT_COMMIT_REQUEST: error = do_bundle_commit(ofconn, bctrl.bundle_id, bctrl.flags); diff --git a/ovn/lib/actions.h b/ovn/lib/actions.h index 0139bfcfe..b44206183 100644 --- a/ovn/lib/actions.h +++ b/ovn/lib/actions.h @@ -29,10 +29,10 @@ struct simap; char *actions_parse(struct lexer *, const struct shash *symtab, const struct simap *ports, uint8_t next_table_id, 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, const struct simap *ports, uint8_t next_table_id, struct ofpbuf *ofpacts, struct expr **prereqsp) - OVS_WARN_UNUSED_RESULT;; + OVS_WARN_UNUSED_RESULT; #endif /* ovn/actions.h */ -- 2.39.2