Remove unused variables and functions.

Found by Clang. Signed-off-by: Jarno Rajahalme <[email protected]> Signed-off-by: Ben Pfaff <[email protected]> Acked-by: Ethan Jackson <[email protected]>
dhanunjaya · Sep 27, 2013 · 6e274d4 · 6e274d4
1 parent b136128
commit 6e274d4
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 375 deletions.
diff --git a/lib/aes128.c b/lib/aes128.c
diff --git a/lib/dpif.c b/lib/dpif.c
@@ -51,8 +51,6 @@ COVERAGE_DEFINE(dpif_flow_flush);
 COVERAGE_DEFINE(dpif_flow_get);
 COVERAGE_DEFINE(dpif_flow_put);
 COVERAGE_DEFINE(dpif_flow_del);
-COVERAGE_DEFINE(dpif_flow_query_list);
-COVERAGE_DEFINE(dpif_flow_query_list_n);
 COVERAGE_DEFINE(dpif_execute);
 COVERAGE_DEFINE(dpif_purge);
 

diff --git a/lib/flow.c b/lib/flow.c
@@ -36,9 +36,6 @@
 #include "openflow/openflow.h"
 #include "packets.h"
 #include "unaligned.h"
-#include "vlog.h"
-
-VLOG_DEFINE_THIS_MODULE(flow);
 
 COVERAGE_DEFINE(flow_extract);
 COVERAGE_DEFINE(miniflow_malloc);

diff --git a/lib/lockfile.c b/lib/lockfile.c
@@ -35,7 +35,6 @@
 VLOG_DEFINE_THIS_MODULE(lockfile);
 
 COVERAGE_DEFINE(lockfile_lock);
-COVERAGE_DEFINE(lockfile_timeout);
 COVERAGE_DEFINE(lockfile_error);
 COVERAGE_DEFINE(lockfile_unlock);
 

diff --git a/lib/mac-learning.c b/lib/mac-learning.c
@@ -29,9 +29,6 @@
 #include "unaligned.h"
 #include "util.h"
 #include "vlan-bitmap.h"
-#include "vlog.h"
-
-VLOG_DEFINE_THIS_MODULE(mac_learning);
 
 COVERAGE_DEFINE(mac_learning_learned);
 COVERAGE_DEFINE(mac_learning_expired);

diff --git a/lib/match.c b/lib/match.c
@@ -21,10 +21,6 @@
 #include "dynamic-string.h"
 #include "ofp-util.h"
 #include "packets.h"
-#include "vlog.h"
-
-VLOG_DEFINE_THIS_MODULE(match);
-
 
 /* Converts the flow in 'flow' into a match in 'match', with the given
  * 'wildcards'. */

diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c
@@ -40,7 +40,6 @@ VLOG_DEFINE_THIS_MODULE(netlink_socket);
 COVERAGE_DEFINE(netlink_overflow);
 COVERAGE_DEFINE(netlink_received);
 COVERAGE_DEFINE(netlink_recv_jumbo);
-COVERAGE_DEFINE(netlink_send);
 COVERAGE_DEFINE(netlink_sent);
 
 /* Linux header file confusion causes this to be undefined. */

diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c
@@ -38,9 +38,6 @@
 #include "packets.h"
 #include "socket-util.h"
 #include "vconn.h"
-#include "vlog.h"
-
-VLOG_DEFINE_THIS_MODULE(ofp_parse);
 
 /* Parses 'str' as an 8-bit unsigned integer into '*valuep'.
  *

diff --git a/lib/ofp-version-opt.c b/lib/ofp-version-opt.c
@@ -1,11 +1,8 @@
 #include <config.h>
+#include "dynamic-string.h"
 #include "ofp-util.h"
 #include "ofp-version-opt.h"
 #include "ovs-thread.h"
-#include "vlog.h"
-#include "dynamic-string.h"
-
-VLOG_DEFINE_THIS_MODULE(ofp_version);
 
 static uint32_t allowed_versions = 0;
 

diff --git a/lib/process.c b/lib/process.c
@@ -37,7 +37,6 @@
 
 VLOG_DEFINE_THIS_MODULE(process);
 
-COVERAGE_DEFINE(process_sigchld);
 COVERAGE_DEFINE(process_start);
 
 struct process {

diff --git a/lib/stream.c b/lib/stream.c
@@ -34,9 +34,6 @@
 #include "poll-loop.h"
 #include "random.h"
 #include "util.h"
-#include "vlog.h"
-
-VLOG_DEFINE_THIS_MODULE(stream);
 
 COVERAGE_DEFINE(pstream_open);
 COVERAGE_DEFINE(stream_open);

diff --git a/lib/vlog.c b/lib/vlog.c
@@ -42,8 +42,6 @@
 
 VLOG_DEFINE_THIS_MODULE(vlog);
 
-COVERAGE_DEFINE(vlog_recursive);
-
 /* ovs_assert() logs the assertion message, so using ovs_assert() in this
  * source file could cause recursion. */
 #undef ovs_assert

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
@@ -68,13 +68,10 @@
 VLOG_DEFINE_THIS_MODULE(ofproto_dpif);
 
 COVERAGE_DEFINE(ofproto_dpif_expired);
-COVERAGE_DEFINE(facet_changed_rule);
 COVERAGE_DEFINE(facet_revalidate);
 COVERAGE_DEFINE(facet_unexpected);
-COVERAGE_DEFINE(facet_suppress);
 COVERAGE_DEFINE(subfacet_install_fail);
 COVERAGE_DEFINE(packet_in_overflow);
-COVERAGE_DEFINE(flow_mod_overflow);
 
 /* Number of implemented OpenFlow tables. */
 enum { N_TABLES = 255 };

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
@@ -57,14 +57,11 @@
 
 VLOG_DEFINE_THIS_MODULE(ofproto);
 
-COVERAGE_DEFINE(ofproto_error);
 COVERAGE_DEFINE(ofproto_flush);
-COVERAGE_DEFINE(ofproto_no_packet_in);
 COVERAGE_DEFINE(ofproto_packet_out);
 COVERAGE_DEFINE(ofproto_queue_req);
 COVERAGE_DEFINE(ofproto_recv_openflow);
 COVERAGE_DEFINE(ofproto_reinit_ports);
-COVERAGE_DEFINE(ofproto_uninstallable);
 COVERAGE_DEFINE(ofproto_update_port);
 
 enum ofproto_state {

diff --git a/ovsdb/log.c b/ovsdb/log.c
@@ -32,9 +32,6 @@
 #include "socket-util.h"
 #include "transaction.h"
 #include "util.h"
-#include "vlog.h"
-
-VLOG_DEFINE_THIS_MODULE(ovsdb_log);
 
 enum ovsdb_log_mode {
     OVSDB_LOG_READ,

diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c
@@ -40,8 +40,6 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(ovsdb_tool);
-
 /* -m, --more: Verbosity level for "show-log" command output. */
 static int show_log_verbosity;
 

diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c
@@ -49,8 +49,6 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(dpctl);
-
 /* -s, --statistics: Print port/flow statistics? */
 static bool print_statistics;