vlog: Make client supply semicolon for VLOG_DEFINE_THIS_MODULE.

It's kind of odd for VLOG_DEFINE_THIS_MODULE to supply its own semicolon, so this commit switches to the more common form.
bigbaer · Oct 29, 2010 · d98e600 · d98e600
1 parent 10a2493
commit d98e600
Show file tree

Hide file tree

Showing 72 changed files with 75 additions and 75 deletions.
diff --git a/build-aux/check-vlog-modules b/build-aux/check-vlog-modules
@@ -40,7 +40,7 @@ vlog_modules=`
 
 # Get the list of modules defined in some source file.
 src_modules=`
-    git grep -h -E '^[ 	]*VLOG_DEFINE(_THIS)?_MODULE\([_a-zA-Z0-9]+\)[ 	]*$' \
+    git grep -h -E '^[ 	]*VLOG_DEFINE(_THIS)?_MODULE\([_a-zA-Z0-9]+\);[ 	]*$' \
     | sed 's/.*(\([_a-zA-Z0-9]\{1,\}\)).*/\1/' \
     | LC_ALL=C sort -u \
     | xargs echo`

diff --git a/lib/backtrace.c b/lib/backtrace.c
@@ -23,7 +23,7 @@
 #include "compiler.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(backtrace)
+VLOG_DEFINE_THIS_MODULE(backtrace);
 
 static uintptr_t OVS_UNUSED
 get_max_stack(void)

diff --git a/lib/coverage.c b/lib/coverage.c
@@ -25,7 +25,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(coverage)
+VLOG_DEFINE_THIS_MODULE(coverage);
 
 static unsigned int epoch;
 

diff --git a/lib/daemon.c b/lib/daemon.c
@@ -35,7 +35,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(daemon)
+VLOG_DEFINE_THIS_MODULE(daemon);
 
 /* --detach: Should we run in the background? */
 static bool detach;

diff --git a/lib/dhcp-client.c b/lib/dhcp-client.c
@@ -37,7 +37,7 @@
 #include "timeval.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(dhcp_client)
+VLOG_DEFINE_THIS_MODULE(dhcp_client);
 
 #define DHCLIENT_STATES                         \
     DHCLIENT_STATE(INIT, 1 << 0)                \

diff --git a/lib/dhcp.c b/lib/dhcp.c
@@ -26,7 +26,7 @@
 #include "ofpbuf.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(dhcp)
+VLOG_DEFINE_THIS_MODULE(dhcp);
 
 /* Information about a DHCP argument type. */
 struct arg_type {

diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c
@@ -43,7 +43,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(dpif_linux)
+VLOG_DEFINE_THIS_MODULE(dpif_linux);
 
 /* Datapath interface for the openvswitch Linux kernel module. */
 struct dpif_linux {

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
@@ -47,7 +47,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(dpif_netdev)
+VLOG_DEFINE_THIS_MODULE(dpif_netdev);
 
 /* Configuration parameters. */
 enum { N_QUEUES = 2 };          /* Number of queues for dpif_recv(). */

diff --git a/lib/dpif.c b/lib/dpif.c
@@ -39,7 +39,7 @@
 #include "valgrind.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(dpif)
+VLOG_DEFINE_THIS_MODULE(dpif);
 
 static const struct dpif_class *base_dpif_classes[] = {
 #ifdef HAVE_NETLINK

diff --git a/lib/entropy.c b/lib/entropy.c
@@ -24,7 +24,7 @@
 #include "socket-util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(entropy)
+VLOG_DEFINE_THIS_MODULE(entropy);
 
 static const char urandom[] = "/dev/urandom";
 

diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
@@ -30,7 +30,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(fatal_signal)
+VLOG_DEFINE_THIS_MODULE(fatal_signal);
 
 /* Signals to catch. */
 static const int fatal_signals[] = { SIGTERM, SIGINT, SIGHUP, SIGALRM };

diff --git a/lib/flow.c b/lib/flow.c
@@ -31,7 +31,7 @@
 #include "unaligned.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(flow)
+VLOG_DEFINE_THIS_MODULE(flow);
 
 static struct arp_eth_header *
 pull_arp(struct ofpbuf *packet)

diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c
@@ -34,7 +34,7 @@
 #include "timeval.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(jsonrpc)
+VLOG_DEFINE_THIS_MODULE(jsonrpc);
 
 struct jsonrpc {
     struct stream *stream;

diff --git a/lib/leak-checker.c b/lib/leak-checker.c
@@ -20,7 +20,7 @@
 #include "backtrace.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(leak_checker)
+VLOG_DEFINE_THIS_MODULE(leak_checker);
 
 #ifndef HAVE_MALLOC_HOOKS
 void

diff --git a/lib/learning-switch.c b/lib/learning-switch.c
@@ -40,7 +40,7 @@
 #include "vconn.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(learning_switch)
+VLOG_DEFINE_THIS_MODULE(learning_switch);
 
 struct lswitch_port {
     struct hmap_node hmap_node; /* Hash node for port number. */

diff --git a/lib/lockfile.c b/lib/lockfile.c
@@ -31,7 +31,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(lockfile)
+VLOG_DEFINE_THIS_MODULE(lockfile);
 
 struct lockfile {
     struct hmap_node hmap_node;

diff --git a/lib/mac-learning.c b/lib/mac-learning.c
@@ -31,7 +31,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(mac_learning)
+VLOG_DEFINE_THIS_MODULE(mac_learning);
 
 /* Returns the number of seconds since 'e' was last learned. */
 int

diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
@@ -63,7 +63,7 @@
 #include "svec.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(netdev_linux)
+VLOG_DEFINE_THIS_MODULE(netdev_linux);
 
 /* These were introduced in Linux 2.6.14, so they might be missing if we have
  * old headers. */

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
@@ -32,7 +32,7 @@
 #include "socket-util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(netdev_vport)
+VLOG_DEFINE_THIS_MODULE(netdev_vport);
 
 struct netdev_vport_notifier {
     struct netdev_notifier notifier;

diff --git a/lib/netdev.c b/lib/netdev.c
@@ -40,7 +40,7 @@
 #include "svec.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(netdev)
+VLOG_DEFINE_THIS_MODULE(netdev);
 
 static struct shash netdev_classes = SHASH_INITIALIZER(&netdev_classes);
 

diff --git a/lib/netlink.c b/lib/netlink.c
@@ -33,7 +33,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(netlink)
+VLOG_DEFINE_THIS_MODULE(netlink);
 
 /* Linux header file confusion causes this to be undefined. */
 #ifndef SOL_NETLINK

diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c
@@ -32,7 +32,7 @@
 #include "vconn.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(ofp_parse)
+VLOG_DEFINE_THIS_MODULE(ofp_parse);
 
 static uint32_t
 str_to_u32(const char *str)

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
@@ -25,7 +25,7 @@
 #include "random.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(ofp_util)
+VLOG_DEFINE_THIS_MODULE(ofp_util);
 
 /* Rate limit for OpenFlow message parse errors.  These always indicate a bug
  * in the peer and so there's not much point in showing a lot of them. */

diff --git a/lib/ovsdb-error.c b/lib/ovsdb-error.c
@@ -25,7 +25,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(ovsdb_error)
+VLOG_DEFINE_THIS_MODULE(ovsdb_error);
 
 struct ovsdb_error {
     const char *tag;            /* String for "error" member. */

diff --git a/lib/ovsdb-idl.c b/lib/ovsdb-idl.c
@@ -36,7 +36,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(ovsdb_idl)
+VLOG_DEFINE_THIS_MODULE(ovsdb_idl);
 
 /* An arc from one idl_row to another.  When row A contains a UUID that
  * references row B, this is represented by an arc from A (the source) to B

diff --git a/lib/pcap.c b/lib/pcap.c
@@ -24,7 +24,7 @@
 #include "ofpbuf.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(pcap)
+VLOG_DEFINE_THIS_MODULE(pcap);
 
 struct pcap_hdr {
     uint32_t magic_number;   /* magic number */

diff --git a/lib/poll-loop.c b/lib/poll-loop.c
@@ -30,7 +30,7 @@
 #include "timeval.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(poll_loop)
+VLOG_DEFINE_THIS_MODULE(poll_loop);
 
 /* An event that will wake the following call to poll_block(). */
 struct poll_waiter {

diff --git a/lib/process.c b/lib/process.c
@@ -34,7 +34,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(process)
+VLOG_DEFINE_THIS_MODULE(process);
 
 struct process {
     struct list node;

diff --git a/lib/rconn.c b/lib/rconn.c
@@ -32,7 +32,7 @@
 #include "vconn.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(rconn)
+VLOG_DEFINE_THIS_MODULE(rconn);
 
 #define STATES                                  \
     STATE(VOID, 1 << 0)                         \

diff --git a/lib/reconnect.c b/lib/reconnect.c
@@ -23,7 +23,7 @@
 #include "poll-loop.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(reconnect)
+VLOG_DEFINE_THIS_MODULE(reconnect);
 
 #define STATES                                  \
     STATE(VOID, 1 << 0)                         \

diff --git a/lib/rtnetlink.c b/lib/rtnetlink.c
@@ -29,7 +29,7 @@
 #include "ofpbuf.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(rtnetlink)
+VLOG_DEFINE_THIS_MODULE(rtnetlink);
 
 /* rtnetlink socket. */
 static struct nl_sock *notify_sock;

diff --git a/lib/socket-util.c b/lib/socket-util.c
@@ -34,7 +34,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(socket_util)
+VLOG_DEFINE_THIS_MODULE(socket_util);
 
 /* Sets 'fd' to non-blocking mode.  Returns 0 if successful, otherwise a
  * positive errno value. */

diff --git a/lib/stream-fd.c b/lib/stream-fd.c
@@ -33,7 +33,7 @@
 #include "stream.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(stream_fd)
+VLOG_DEFINE_THIS_MODULE(stream_fd);
 
 /* Active file descriptor stream. */
 

diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c
@@ -45,7 +45,7 @@
 #include "timeval.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(stream_ssl)
+VLOG_DEFINE_THIS_MODULE(stream_ssl);
 
 /* Active SSL. */
 

diff --git a/lib/stream-tcp.c b/lib/stream-tcp.c
@@ -32,7 +32,7 @@
 #include "stream-fd.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(stream_tcp)
+VLOG_DEFINE_THIS_MODULE(stream_tcp);
 
 /* Active TCP. */
 

diff --git a/lib/stream-unix.c b/lib/stream-unix.c
@@ -35,7 +35,7 @@
 #include "stream-fd.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(stream_unix)
+VLOG_DEFINE_THIS_MODULE(stream_unix);
 
 /* Active UNIX socket. */
 

diff --git a/lib/stream.c b/lib/stream.c
@@ -37,7 +37,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(stream)
+VLOG_DEFINE_THIS_MODULE(stream);
 
 /* State of an active stream.*/
 enum stream_state {

diff --git a/lib/svec.c b/lib/svec.c
@@ -24,7 +24,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(svec)
+VLOG_DEFINE_THIS_MODULE(svec);
 
 void
 svec_init(struct svec *svec)

diff --git a/lib/timeval.c b/lib/timeval.c
@@ -29,7 +29,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(timeval)
+VLOG_DEFINE_THIS_MODULE(timeval);
 
 /* The clock to use for measuring time intervals.  This is CLOCK_MONOTONIC by
  * preference, but on systems that don't have a monotonic clock we fall back

diff --git a/lib/unixctl.c b/lib/unixctl.c
@@ -42,7 +42,7 @@
 #include <time.h>
 #endif
 
-VLOG_DEFINE_THIS_MODULE(unixctl)
+VLOG_DEFINE_THIS_MODULE(unixctl);
 
 struct unixctl_command {
     unixctl_cb_func *cb;

diff --git a/lib/util.c b/lib/util.c
@@ -25,7 +25,7 @@
 #include "coverage.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(util)
+VLOG_DEFINE_THIS_MODULE(util);
 
 const char *program_name;
 

diff --git a/lib/vconn-stream.c b/lib/vconn-stream.c
@@ -34,7 +34,7 @@
 #include "vconn.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(vconn_stream)
+VLOG_DEFINE_THIS_MODULE(vconn_stream);
 
 /* Active stream socket vconn. */
 

diff --git a/lib/vconn.c b/lib/vconn.c
@@ -38,7 +38,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(vconn)
+VLOG_DEFINE_THIS_MODULE(vconn);
 
 /* State of an active vconn.*/
 enum vconn_state {

diff --git a/lib/vlog.c b/lib/vlog.c
@@ -33,7 +33,7 @@
 #include "unixctl.h"
 #include "util.h"
 
-VLOG_DEFINE_THIS_MODULE(vlog)
+VLOG_DEFINE_THIS_MODULE(vlog);
 
 /* Name for each logging level. */
 static const char *level_names[VLL_N_LEVELS] = {