commit b7a752a1199e7cd6e6e55a48245b16b40490bd92
author mukesh agrawal <quiche@chromium.org> Thu Nov 21 15:54:48 2013 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Dec 05 07:47:02 2013 +0000
tree 198762030699bc5c94a694a0779007d96d330dfb
parent 9f06c870229b00cdd19224cb12c4202de65772ae

set_cellular_ppp: clean up style issues

This CL addresses some style issues pointed out during the review
of CL:170103.

BUG=chromium:295972
TEST=see test stanza of CL:170103

Change-Id: I176c5443bcb117ea3e2d2094028bf0c04d341327
Reviewed-on: https://chromium-review.googlesource.com/177713
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: mukesh agrawal <quiche@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

bin/set_cellular_ppp

diff --git a/bin/set_cellular_ppp b/bin/set_cellular_ppp
index bd8d66a..73516a6 100755
--- a/bin/set_cellular_ppp
+++ b/bin/set_cellular_ppp
@@ -47,25 +47,18 @@
     "${object}" "${method}" "$@"
 }
 
-get_profile_property() {
-  local profile="$1"
-  local property="$2"
+get_property() {
+  local interface="${1:?internal error}"
+  local object="${2:?internal error}"
+  local property="${3:?nternal error}"
 
-  dbus "${profile}" "${IPROFILE}.GetProperties" 2>/dev/null \
-    | sed -n "/\/${property}/{s/.* //p}"
-}
-
-get_service_property() {
-  local service="$1"
-  local property="$2"
-
-  dbus "${service}" "${ISERVICE}.GetProperties" 2>/dev/null \
+  dbus "${object}" "${interface}.GetProperties" 2>/dev/null \
     | sed -n "/\/${property}/{s/.* //p}"
 }
 
 display_username() {
   local service="$1"
-  local username="$(get_service_property ${service} ${USERNAME_PROPERTY})"
+  local username="$(get_property ${ISERVICE} ${service} ${USERNAME_PROPERTY})"
 
   if [ -n "${username}" ]; then
     echo "PPP username: " ${username}
@@ -117,7 +110,7 @@
   local profile_name
 
   for profile in $(get_profiles); do
-    profile_name="$(get_profile_property ${profile} Name)"
+    profile_name="$(get_property ${IPROFILE} ${profile} Name)"
     if [ ${profile_name} = ${DEFAULT_PROFILE_NAME} ]; then
       echo "${profile}"
       break
@@ -130,7 +123,7 @@
   local service_type
 
   for service in $(get_services); do
-    service_type="$(get_service_property ${service} Type)"
+    service_type="$(get_property ${ISERVICE} ${service} Type)"
     if [ "${service_type}" = "cellular" ]; then
       echo "${service}"
       break
@@ -153,7 +146,8 @@
   dbus "${service}" "${ISERVICE}.SetProperty" \
     "string:${PROFILE_PROPERTY}" "variant:string:${profile}"
 
-  local new_profile=$(get_service_property "${service}" "${PROFILE_PROPERTY}")
+  local new_profile=$(
+    get_property "${ISERVICE}" "${service}" "${PROFILE_PROPERTY}")
   return $([ "${new_profile}" = "${profile}" ])
 }