[Pkg-voip-commits] [dahdi-tools] 206/285: xpp_fxloader: rename variable: default_law -> law

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository dahdi-tools.

commit 60401c5f490f980b144c522520516fb11d72b888
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Thu Jul 31 14:54:49 2014 +0300

    xpp_fxloader: rename variable: default_law -> law
    
    The variable 'default_law' was the result of a partial renaming of the
    original variable 'law'. Let's keep all of them in sync.
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
---
 xpp/xpp_fxloader | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xpp/xpp_fxloader b/xpp/xpp_fxloader
index 5c8bced..ce5133a 100644
--- a/xpp/xpp_fxloader
+++ b/xpp/xpp_fxloader
@@ -327,14 +327,14 @@ load_fw_device() {
 				fi
 				# Fallback to legacy xpp.conf
 				default_pri_protocol=''
-				default_law=''
+				law=''
 				if [ -r "$XPP_CONFIG" ]; then
 					default_pri_protocol=`awk '/^pri_protocol/ {print $2}' $XPP_CONFIG`
 					if [ "$default_pri_protocol" != '' ]; then
 						debug "ECHO($dev_short): Found legacy xpp.conf setting -- $default_pri_protocol"
 						# "E1" or empty (implied E1) means aLaw
 						if [ "$default_pri_protocol" != 'T1' ]; then
-							default_law='-A'
+							law='-A'
 						fi
 					fi
 				fi
@@ -343,7 +343,7 @@ load_fw_device() {
 			caps_num=`echo "$abtool_output" | grep 'ECHO ports' | sed -e 's/.*: *//'`
 			debug "ECHO($dev_short): $caps_num channels allowed."
 			if [ "$caps_num" != '0' ]; then
-				run_astribank_hexload -D "$dev" -O $default_law $pri_spec_params "$echo_file"
+				run_astribank_hexload -D "$dev" -O $law $pri_spec_params "$echo_file"
 			else
 				echo "WARNING: ECHO burning was skipped (no capabilities)"
 			fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-tools.git