diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2009-09-22 10:59:17 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2009-09-22 11:24:21 -0500 |
| commit | cfcf7e6516de771bff1feb1f7be8a3e0d5e03358 (patch) | |
| tree | cd284fc3b02c0f582200ddee340d66b33801ebd5 /src/call-meter.c | |
| parent | b8dcd905fb2c2ee65afea0a512ac63a9af3abeec (diff) | |
| download | ofono-cfcf7e6516de771bff1feb1f7be8a3e0d5e03358.tar.bz2 | |
Simplify: Use dbus_message_iter_get_args
Diffstat (limited to 'src/call-meter.c')
| -rw-r--r-- | src/call-meter.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/call-meter.c b/src/call-meter.c index 45c41c51..e264029c 100644 --- a/src/call-meter.c +++ b/src/call-meter.c @@ -606,26 +606,21 @@ static DBusMessage *cm_acm_reset(DBusConnection *conn, DBusMessage *msg, void *data) { struct ofono_call_meter *cm = data; - DBusMessageIter iter; const char *pin2; + if (!cm->driver->acm_reset) + return __ofono_error_not_implemented(msg); + if (cm->pending) return __ofono_error_busy(msg); - if (!dbus_message_iter_init(msg, &iter)) + if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &pin2, + DBUS_TYPE_INVALID) == FALSE) return __ofono_error_invalid_args(msg); - if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) - return __ofono_error_invalid_args(msg); - - dbus_message_iter_get_basic(&iter, &pin2); - if (!is_valid_pin(pin2)) return __ofono_error_invalid_format(msg); - if (!cm->driver->acm_reset) - return __ofono_error_not_implemented(msg); - cm->pending = dbus_message_ref(msg); cm->driver->acm_reset(cm, pin2, acm_reset_callback, cm); |