ncm: sort config variables a little and fix minor bugs

Group 'local' declarations and 'json_get_vars', sort alphabetically within groups, and split off more generic parameters.

- delegate and sourcefilter were not declared as local variables

Signed-off-by: Leon M. Busch-George <leon@georgemail.eu>

diff --git a/package/network/utils/comgt/files/ncm.sh b/package/network/utils/comgt/files/ncm.sh
index e9412b28feb38bcd55002d4d8a3a9d3bb3b1448e..761dafb24e3131b8583d4f80db79b46739fa6677 100644 (file)
--- a/package/network/utils/comgt/files/ncm.sh
+++ b/package/network/utils/comgt/files/ncm.sh
@@ -28,12 +28,13 @@ proto_ncm_init_config() {
 proto_ncm_setup() {
        local interface="$1"
 
-       local manufacturer initialize setmode connect finalize devname devpath ifpath
+       local connect context_type devname devpath finalize ifpath initialize manufacturer setmode
 
-       local device ifname  apn auth username password pincode delay mode pdptype profile $PROTO_DEFAULT_OPTIONS
-       json_get_vars device ifname apn auth username password pincode delay mode pdptype sourcefilter delegate profile $PROTO_DEFAULT_OPTIONS
+       local delegate sourcefilter $PROTO_DEFAULT_OPTIONS
+       json_get_vars delegate sourcefilter $PROTO_DEFAULT_OPTIONS
 
-       local context_type
+       local apn auth delay device ifname mode password pdptype pincode profile username
+       json_get_vars apn auth delay device ifname mode password pdptype pincode profile username
 
        [ "$metric" = "" ] && metric="0"