소스 검색

utils/kamctl: removed unused default values

- test if DEFAULT_Q is set inside the function using it, because it has
  single place usage
Daniel-Constantin Mierla 11 년 전
부모
커밋
1735feed8e
3개의 변경된 파일4개의 추가작업 그리고 10개의 파일을 삭제
  1. 4 0
      utils/kamctl/kamctl
  2. 0 4
      utils/kamctl/kamctlrc
  3. 0 6
      utils/kamctl/kamdbctl.base

+ 4 - 0
utils/kamctl/kamctl

@@ -2454,6 +2454,10 @@ usrloc() {
 				exit 1
 			fi
 
+			if [ -z "$DEFAULT_Q" ] ; then
+				DEFAULT_Q = "1.0"
+			fi
+
 			$CTLCMD ul_add "$USRLOC_TABLE" "$OSERUSER@$OSERDOMAIN" "$2" \
 "$UL_EXPIRES" "$DEFAULT_Q" "$UL_PATH" "$UL_FLAGS" "$BR_FLAGS" "$ALL_METHODS"
 			exit $?

+ 0 - 4
utils/kamctl/kamctlrc

@@ -56,11 +56,7 @@
 # FIXME
 
 # FOREVER="2030-05-28 21:32:15"
-# DEFAULT_ALIASES_EXPIRES=$FOREVER
 # DEFAULT_Q="1.0"
-# DEFAULT_CALLID="Default-Call-ID"
-# DEFAULT_CSEQ="13"
-# DEFAULT_LOCATION_EXPIRES=$FOREVER
 
 
 # Program to calculate a message-digest fingerprint 

+ 0 - 6
utils/kamctl/kamdbctl.base

@@ -54,12 +54,6 @@ DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs
 # FIXME
 
 FOREVER=${FOREVER:-2030-05-28 21:32:15}
-DEFAULT_ALIASES_EXPIRES=${DEFAULT_ALIASES_EXPIRES:-${FOREVER}}
-DEFAULT_Q=${DEFAULT_Q:-1.0}
-DEFAULT_CALLID=${DEFAULT_CALLID:-Default-Call-ID}
-DEFAULT_CSEQ=${DEFAULT_CSEQ:-13}
-DEFAULT_LOCATION_EXPIRES=${DEFAULT_LOCATION_EXPIRES:-${FOREVER}}
-
 
 # default location for config files
 DEFAULT_CFG_DIR=/usr/local/etc/kamailio