From 7e01fbd0789a0da22314fca7c2c9476c4d294fef Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Thu, 9 Feb 2012 09:54:07 +0100 Subject: added E_ errorcodes --- CHANGELOG | 1 + loadbars | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ffaed11..f1d3054 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ showcores=1 # Always show cores on startup showtext=0 # Always don't display text on startup * Remove --title option (no need anyway) +* Some code cleanups * Some bugfixes Sat Feb 4 10:56:27 CET 2012 diff --git a/loadbars b/loadbars index 14e5a0d..817d163 100755 --- a/loadbars +++ b/loadbars @@ -50,6 +50,9 @@ use constant { USER_YELLOW0 => 50, INTERVAL => 0.1, INTERVAL_WARN => 1.0, + E_OK => 0, + E_UNKNOWN => 1, + E_NOHOST => 2, }; $| = 1; @@ -806,7 +809,7 @@ sub main_loop ($@) { say "Good bye"; - exit 0; + exit E_OK; } sub dispatch_table () { @@ -1147,7 +1150,7 @@ sub get_cluster_hosts ($;$) { $recursion = 1; } - elsif ( $recursion > CSSH_MAX_RECURSION ) { + elsif ( $recursion > CSSH_MAX_RECURSION ) { error "CSSH_MAX_RECURSION reached. Infinite circle loop in " . CSSH_CONFFILE . "?"; } @@ -1174,6 +1177,7 @@ sub get_cluster_hosts ($;$) { my @hosts; push @hosts, get_cluster_hosts $_, ( $recursion + 1 ) for ( split /\s+/, $hosts ); + return @hosts; } @@ -1189,7 +1193,7 @@ sub main () { if ( defined $usage ) { say $dispatch->('usage'); - exit 1; + exit E_OK; } set_showcores_regexp; @@ -1206,11 +1210,13 @@ sub main () { } else { say $dispatch->('usage'); - exit 1; + exit E_NOHOST; } my @threads = create_threads @hosts; main_loop $dispatch, @threads; + + exit E_OK; } main; -- cgit v1.2.3