From bd0cfdfa21fa51e280a03dba5c8b6a650c5152ff Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Mon, 13 Aug 2012 12:46:34 +0200 Subject: [PATCH] dbusoob: Simplify remove_remote_data str2ba already checks if address is valid before converting and returns -1 in case of failure. --- plugins/dbusoob.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/dbusoob.c b/plugins/dbusoob.c index 179134289..d2591594e 100644 --- a/plugins/dbusoob.c +++ b/plugins/dbusoob.c @@ -164,11 +164,9 @@ static DBusMessage *remove_remote_data(DBusConnection *conn, DBusMessage *msg, DBUS_TYPE_INVALID)) return btd_error_invalid_args(msg); - if (bachk(addr)) + if (str2ba(addr, &bdaddr) < 0) return btd_error_invalid_args(msg); - str2ba(addr, &bdaddr); - if (btd_adapter_remove_remote_oob_data(adapter, &bdaddr)) return btd_error_failed(msg, "Request failed"); -- 2.47.3