From 46e2de55def5c1a660f7ebbec9f22bbb5a8f8cf2 Mon Sep 17 00:00:00 2001 From: Lars Kruse Date: Sun, 16 Sep 2018 04:23:14 +0200 Subject: [PATCH] Remove unused "autoconf" handling from plugins without this capability Some plugins contained code for handling "autoconf" (always returning "no") but did not announce the respective capability via the magic marker. --- plugins/router/snmp__linksys_poe | 3 --- plugins/rtorrent/rtom_allsessions_mem | 4 ---- plugins/rtorrent/rtom_allsessions_peers | 4 ---- plugins/rtorrent/rtom_allsessions_spdd | 4 ---- plugins/rtorrent/rtom_allsessions_vol | 4 ---- plugins/rtorrent/rtom_mem | 4 ---- plugins/rtorrent/rtom_peers | 4 ---- plugins/rtorrent/rtom_spdd | 4 ---- plugins/rtorrent/rtom_vol | 4 ---- plugins/wuala/wuala_stats | 7 ++----- 10 files changed, 2 insertions(+), 40 deletions(-) diff --git a/plugins/router/snmp__linksys_poe b/plugins/router/snmp__linksys_poe index 0e5c9a4d..a79a27ea 100755 --- a/plugins/router/snmp__linksys_poe +++ b/plugins/router/snmp__linksys_poe @@ -73,9 +73,6 @@ community = ENV['community'] || "public" version = ENV['version'] == '1' ? :SNMPv1 : :SNMPv2c case ARGV[0] -when "autoconf" - puts "no" - exit 1 when "snmpconf" puts "require 1.3.6.1.4.1.3955.89.108.1.1.2.1. [0-9]" puts "require 1.3.6.1.4.1.3955.89.108.1.1.5.1. [0-9]" diff --git a/plugins/rtorrent/rtom_allsessions_mem b/plugins/rtorrent/rtom_allsessions_mem index 565eea90..82c6dcd4 100755 --- a/plugins/rtorrent/rtom_allsessions_mem +++ b/plugins/rtorrent/rtom_allsessions_mem @@ -46,10 +46,6 @@ #%# family=auto -if ( $ARGV[0] and $ARGV[0] eq "autoconf" ) { - exit 1; -} - if ( $ARGV[0] and $ARGV[0] eq "config" ) { my $category = $ENV{"category"} || ""; print "graph_title rTorrent memory usage\n"; diff --git a/plugins/rtorrent/rtom_allsessions_peers b/plugins/rtorrent/rtom_allsessions_peers index f452677c..93a06a38 100755 --- a/plugins/rtorrent/rtom_allsessions_peers +++ b/plugins/rtorrent/rtom_allsessions_peers @@ -44,10 +44,6 @@ #%# family=auto -if ( $ARGV[0] and $ARGV[0] eq "autoconf" ) { - exit 1; -} - if ( $ARGV[0] and $ARGV[0] eq "config" ) { my $category = $ENV{"category"} || ""; print "graph_title rTorrent peer statistics\n"; diff --git a/plugins/rtorrent/rtom_allsessions_spdd b/plugins/rtorrent/rtom_allsessions_spdd index a9ce779b..cf893cb5 100755 --- a/plugins/rtorrent/rtom_allsessions_spdd +++ b/plugins/rtorrent/rtom_allsessions_spdd @@ -56,10 +56,6 @@ #%# family=auto -if ( $ARGV[0] and $ARGV[0] eq "autoconf" ) { - exit 1; -} - if ( $ARGV[0] and $ARGV[0] eq "config" ) { my $diff = $ENV{"diff"} || ""; my $category = $ENV{"category"} || ""; diff --git a/plugins/rtorrent/rtom_allsessions_vol b/plugins/rtorrent/rtom_allsessions_vol index 97818291..ed483e66 100755 --- a/plugins/rtorrent/rtom_allsessions_vol +++ b/plugins/rtorrent/rtom_allsessions_vol @@ -46,10 +46,6 @@ my @views = ( "default", "started", "stopped", "complete", "incomplete" ); -if ( $ARGV[0] and $ARGV[0] eq "autoconf" ) { - exit 1; -} - if ( $ARGV[0] and $ARGV[0] eq "config" ) { my $category = $ENV{"category"} || ""; print "graph_args --base 1000 -r --lower-limit 0\n"; diff --git a/plugins/rtorrent/rtom_mem b/plugins/rtorrent/rtom_mem index afb00cef..f691aab1 100755 --- a/plugins/rtorrent/rtom_mem +++ b/plugins/rtorrent/rtom_mem @@ -44,10 +44,6 @@ #%# family=auto -if ( $ARGV[0] and $ARGV[0] eq "autoconf" ) { - exit 1; -} - if ( $ARGV[0] and $ARGV[0] eq "config" ) { my $category = $ENV{"category"} || ""; print "graph_title rTorrent memory usage\n"; diff --git a/plugins/rtorrent/rtom_peers b/plugins/rtorrent/rtom_peers index dace07bb..ae414542 100755 --- a/plugins/rtorrent/rtom_peers +++ b/plugins/rtorrent/rtom_peers @@ -44,10 +44,6 @@ #%# family=auto -if ( $ARGV[0] and $ARGV[0] eq "autoconf" ) { - exit 1; -} - if ( $ARGV[0] and $ARGV[0] eq "config" ) { my $category = $ENV{"category"} || ""; print "graph_title rTorrent peer statistics\n"; diff --git a/plugins/rtorrent/rtom_spdd b/plugins/rtorrent/rtom_spdd index cbb06c14..e2b08835 100755 --- a/plugins/rtorrent/rtom_spdd +++ b/plugins/rtorrent/rtom_spdd @@ -57,10 +57,6 @@ #%# family=auto -if ( $ARGV[0] and $ARGV[0] eq "autoconf" ) { - exit 1; -} - if ( $ARGV[0] and $ARGV[0] eq "config" ) { my $diff = $ENV{"diff"} || ""; my $category = $ENV{"category"} || ""; diff --git a/plugins/rtorrent/rtom_vol b/plugins/rtorrent/rtom_vol index f8e08e33..ea88fe13 100755 --- a/plugins/rtorrent/rtom_vol +++ b/plugins/rtorrent/rtom_vol @@ -45,10 +45,6 @@ my @views = ( "default", "started", "stopped", "complete", "incomplete" ); -if ( $ARGV[0] and $ARGV[0] eq "autoconf" ) { - exit 1; -} - if ( $ARGV[0] and $ARGV[0] eq "config" ) { my $category = $ENV{"category"} || ""; print "graph_args --base 1000 -r --lower-limit 0\n"; diff --git a/plugins/wuala/wuala_stats b/plugins/wuala/wuala_stats index f151b737..57ec557b 100755 --- a/plugins/wuala/wuala_stats +++ b/plugins/wuala/wuala_stats @@ -33,11 +33,8 @@ # my $wualadir = $ENV{wualadir}; -if ($ARGV[0] and $ARGV[0] eq "autoconf") -{ - print "no\n"; - exit 1; -} elsif ($ARGV[0] and $ARGV[0] eq "config") + +if ($ARGV[0] and $ARGV[0] eq "config") { if($0 =~ /.*_uptime/) { print "graph_args -l0 --vertical-label %\n";