>From 54540a307fb6bb23753539836d0ddadce2232d23 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Fri, 2 May 2014 09:44:03 +0200 Subject: [PATCH 8/8] squash_me to: sss_dbus: add shortcuts for common use cases --- src/lib/dbus/sss_dbus_common.c | 8 ++++---- src/tests/cmocka/test_sss_dbus.c | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/dbus/sss_dbus_common.c b/src/lib/dbus/sss_dbus_common.c index 116db2e4f5a31405b4b7aa68989427ee566cdb4e..fc47cd13179aa460ed11347f5ab1f24385139c6f 100644 --- a/src/lib/dbus/sss_dbus_common.c +++ b/src/lib/dbus/sss_dbus_common.c @@ -28,7 +28,7 @@ static sss_dbus_error sss_dbus_fetch_object_by_attr(sss_dbus_ctx *ctx, const char *method, - unsigned int attr_type, + int attr_type, const void *attr, sss_dbus_object **_object) { @@ -86,8 +86,8 @@ sss_dbus_list_domains(sss_dbus_ctx *ctx, char **object_paths = NULL; char **domains = NULL; const char *name = NULL; - int size; - int i; + unsigned int size; + unsigned int i; sss_dbus_error ret; if (_domains == NULL) { @@ -101,7 +101,7 @@ sss_dbus_list_domains(sss_dbus_ctx *ctx, } /* calculate number of paths acquired and allocate memory for domains */ - for (size = 0; object_paths[size] != NULL; size++) + for (size = 0; object_paths[size] != NULL; size++); domains = _alloc(ctx, char *, size + 1); if (domains == NULL) { diff --git a/src/tests/cmocka/test_sss_dbus.c b/src/tests/cmocka/test_sss_dbus.c index ec37ad7d62657ae26b28f2fa7394307ddb9f52dc..5b24661f7fb1d703ae0f4252b9155f81f13746f1 100644 --- a/src/tests/cmocka/test_sss_dbus.c +++ b/src/tests/cmocka/test_sss_dbus.c @@ -1718,6 +1718,7 @@ void test_sss_dbus_list_domains(void **state) assert_null(out[i]); + sss_dbus_free_string_array(ctx, &out); /* messages are unrefed in the library */ } -- 1.9.0