[sr-dev] git:master: utils/kamctl: removed unused default values

[Daniel-Constantin Mierla]

Module: sip-router
Branch: master
Commit: 1735feed8e287e92c3d81cf6a4d873460f6ee878
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1735feed8e287e92c3d81cf6a4d873460f6ee878

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Tue Sep 16 18:13:02 2014 +0200

utils/kamctl: removed unused default values

- test if DEFAULT_Q is set inside the function using it, because it has
  single place usage

---

 utils/kamctl/kamctl        |    4 ++++
 utils/kamctl/kamctlrc      |    4 ----
 utils/kamctl/kamdbctl.base |    6 ------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl
index 8fa8ac2..bf12fbd 100755
--- a/utils/kamctl/kamctl
+++ b/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 $?
diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc
index 3ffad11..c3e0103 100644
--- a/utils/kamctl/kamctlrc
+++ b/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 
diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base
index b4ed9ad..bb74810 100644
--- a/utils/kamctl/kamdbctl.base
+++ b/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