follow normal zsh case conventions in some functions

1 files changed, 48 insertions, 46 deletions

diff --git a/src/_vnstat b/src/_vnstat
index bfb08dd..5676f8b 100644
--- a/src/_vnstat
+++ b/src/_vnstat
@@ -38,73 +38,75 @@
 #
 # ------------------------------------------------------------------------------
 
-local context state state_descr line
+local curcontext="$curcontext" state state_descr line ret=1
 typeset -A opt_args
 
 local period="-d --days -h --hours -m --months -w --weeks"
 
-_arguments : \
-  '--cleartop[Remove all top 10 entries]' \
-  '--config[Specify alternate configuration file]:file:_files' \
-  "($period)"{-d,--days}'[Show traffic for days]' \
-  "($period)"{-h,--hours}'[Show trafic for last 24 hours]' \
-  "($period)"{-m,--months}'[Show traffic for months]' \
-  "($period)"{-w,--weeks}'[Show traffic for 7 days]' \
-  '--dbdir[Specify database directory]:directory:_files -/' \
-  '(-D --debug)'{-D,--debug}'[Show additional debug output]' \
-  '--delete[Delete database and stop monitoring selected interface]' \
-  '--dumpdb[Dump database in parseable format]' \
-  '(--disable)--enable[Enable updates for selected interface]' \
-  '(--enable)--disable[Disable updates for selected interface]' \
-  '(-i --iface)'{-i,--iface}'[Specify interface for actions]:interface:->interface' \
-  '--iflist[List available interfaces]' \
-  '(-l --live)'{-l,--live}'[Display current transfer rate]:mode:->live' \
-  '--locale[Specify locale]:locale:' \
-  '--nick[Set nickname for alias]:nickname:' \
-  '--oneline[Traffic summary in one-line, parseable format]' \
-  '(-q --query)'{-q,--query}'[Force database query mode]' \
-  '(-r --reset)'{-r,--reset}'[Reset internal counters]' \
-  '--rebuildtotal[Reset total trafic counters]' \
-  '(-ru --rateunit)'{-ru,--rateunit}'[Swap configured rate unit]' \
-  '--savemerged[Write result of database merge]'  \
-  '(-s --short)'{-s,--short}'[Use short output mode]' \
-  '--style[Modify content and style of output]:style:->style' \
-  '--sync[Synchronize internal counters]' \
-  '--testkernel[Test kernel boot time information]' \
-  '(-t --top10)'{-t,--top10}'[Show all time top 10 traffic days]' \
-  '-tr[Calculate amount of traffic in given time]:seconds:' \
-  '(-u --update)'{-u,--update}'[Update databases]' \
-  '--xml[Show database content in XML format]' \
-  '(-)'{-v,--version}'[Show current version]' \
-  '(-)'{-\?,--help}'[Show command summary]' \
-  '(-)--longhelp[Show complete options list]' \
+_arguments -C : \
+  '--cleartop[remove all top 10 entries]' \
+  '--config[specify alternate configuration file]:file:_files' \
+  "($period)"{-d,--days}'[show traffic for days]' \
+  "($period)"{-h,--hours}'[show trafic for last 24 hours]' \
+  "($period)"{-m,--months}'[show traffic for months]' \
+  "($period)"{-w,--weeks}'[show traffic for 7 days]' \
+  '--dbdir[specify database directory]:directory:_files -/' \
+  '(-D --debug)'{-D,--debug}'[show additional debug output]' \
+  '--delete[delete database and stop monitoring selected interface]' \
+  '--dumpdb[dump database in parseable format]' \
+  '(--disable)--enable[enable updates for selected interface]' \
+  '(--enable)--disable[disable updates for selected interface]' \
+  '(-i --iface)'{-i,--iface}'[specify interface for actions]:interface:->interface' \
+  '--iflist[list available interfaces]' \
+  '(-l --live)'{-l,--live}'[display current transfer rate]:mode:->live' \
+  '--locale[specify locale]:locale:' \
+  '--nick[set nickname for alias]:nickname:' \
+  '--oneline[traffic summary in one-line, parseable format]' \
+  '(-q --query)'{-q,--query}'[force database query mode]' \
+  '(-r --reset)'{-r,--reset}'[reset internal counters]' \
+  '--rebuildtotal[reset total trafic counters]' \
+  '(-ru --rateunit)'{-ru,--rateunit}'[swap configured rate unit]' \
+  '--savemerged[write result of database merge]'  \
+  '(-s --short)'{-s,--short}'[use short output mode]' \
+  '--style[modify content and style of output]:style:->style' \
+  '--sync[synchronize internal counters]' \
+  '--testkernel[test kernel boot time information]' \
+  '(-t --top10)'{-t,--top10}'[show all time top 10 traffic days]' \
+  '-tr[calculate amount of traffic in given time]:seconds:' \
+  '(-u --update)'{-u,--update}'[update databases]' \
+  '--xml[show database content in XML format]' \
+  '(-)'{-v,--version}'[show current version]' \
+  '(-)'{-\?,--help}'[show command summary]' \
+  '(-)--longhelp[show complete options list]' \
   && ret=0
 
 case "$state" in
 
   (live)
-    _values 'Live mode' \
-      '0[Packets per second]' \
-      '1[Traffic counters]'
+    _values 'live mode' \
+      '0[packets per second]' \
+      '1[traffic counters]' && ret=0
     ;;
 
   (style)
-    _values 'Output style' \
-      '0[Narrow output]' \
-      '1[Enable bar column]' \
-      '2[Bar column with average traffic rate]' \
-      '3[Enable average traffic rate]' \
-      '4[Disable use of terminal control characters]'
+    _values 'output style' \
+      '0[narrow output]' \
+      '1[enable bar column]' \
+      '2[bar column with average traffic rate]' \
+      '3[enable average traffic rate]' \
+      '4[disable use of terminal control characters]' && ret=0
     ;;
 
   (interface)
     local interfaces="$(_call_program interfaces 'vnstat --iflist')"
     interfaces="${interfaces#*:}"
-    _values -s + 'Interface' ${(z)interfaces}
+    _values -s + 'interface' ${(z)interfaces} && ret=0
     ;;
 
 esac
 
+return ret
+
 # Local Variables:
 # mode: Shell-Script
 # sh-indentation: 2