[PATCH] dbus: Fix l_dbus_client_set_proxy_handlers user data
by Claudio Takahasi
Proxy property changed callback is passing wrong argument. The argument
should be user data instead of destroy function.
---
ell/dbus-client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ell/dbus-client.c b/ell/dbus-client.c
index 2684df2..1628b67 100644
--- a/ell/dbus-client.c
+++ b/ell/dbus-client.c
@@ -349,7 +349,7 @@ static void proxy_update_property(struct l_dbus_proxy *proxy,
done:
if (proxy->client->properties_changed_cb && proxy->ready)
proxy->client->properties_changed_cb(proxy, name, prop->msg,
- proxy->client->proxy_cb_data_destroy);
+ proxy->client->proxy_cb_data);
}
static void proxy_invalidate_properties(struct l_dbus_proxy *proxy,
--
2.16.2
3 years, 7 months
[PATCH] unit: Fix typo in pbkdf2 output
by Mat Martineau
---
unit/test-pbkdf2.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/unit/test-pbkdf2.c b/unit/test-pbkdf2.c
index c970abe..f1b13ea 100644
--- a/unit/test-pbkdf2.c
+++ b/unit/test-pbkdf2.c
@@ -54,12 +54,12 @@ static void pbkdf2_test(const void *data)
key_len = test->key_len ? : (strlen(test->key) / 2);
- printf("Password = \"%s\" (%d octects)\n",
+ printf("Password = \"%s\" (%d octets)\n",
test->password, password_len);
- printf("Salt = \"%s\" (%d octects)\n",
+ printf("Salt = \"%s\" (%d octets)\n",
test->salt, salt_len);
printf("Count = %d\n", test->count);
- printf("Key = %s (%d octects)\n", test->key, key_len);
+ printf("Key = %s (%d octets)\n", test->key, key_len);
result = l_pkcs5_pbkdf2(L_CHECKSUM_SHA1, test->password,
(const uint8_t *) test->salt, salt_len,
--
2.16.1
3 years, 8 months
