>From 4d635d57bf0703e32d7a02c70230b9f2a4da9085 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Fri, 2 May 2014 09:42:16 +0200 Subject: [PATCH 6/8] squash_me to: sss_dbus: add support for string dictionary --- src/lib/dbus/sss_dbus.c | 2 +- src/lib/dbus/sss_dbus_parser.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/dbus/sss_dbus.c b/src/lib/dbus/sss_dbus.c index e66632abcd3a36f1ca704ed3f0c0dd191bde0e49..743f7a81a43007f77830a5ff0cf1c07b5c5f6493 100644 --- a/src/lib/dbus/sss_dbus.c +++ b/src/lib/dbus/sss_dbus.c @@ -505,7 +505,7 @@ sss_dbus_free_attrs(sss_dbus_ctx *ctx, sss_dbus_attr ***_attrs) { sss_dbus_attr **attrs = NULL; - int i, j, k; + unsigned int i, j, k; if (_attrs == NULL || *_attrs == NULL) { return; diff --git a/src/lib/dbus/sss_dbus_parser.c b/src/lib/dbus/sss_dbus_parser.c index f6ae41ffe04eec088a0d51e950e6b77a433192d9..46fc3dcd89acf2bd91e4a903998b27046f22825a 100644 --- a/src/lib/dbus/sss_dbus_parser.c +++ b/src/lib/dbus/sss_dbus_parser.c @@ -112,7 +112,7 @@ sss_dbus_parse_dict(sss_dbus_ctx *ctx, sss_dbus_error ret; const char *key = NULL; const char *value = NULL; - int i; + unsigned int i; dbus_message_iter_recurse(iter, &dict_iter); @@ -381,7 +381,7 @@ sss_dbus_parse_array(sss_dbus_ctx *ctx, } if (!dbus_message_iter_next(&array_iter) - && i < attr->num_values - 1) { + && i + 1 < attr->num_values) { ret = SSS_DBUS_INTERNAL_ERROR; goto done; } @@ -396,7 +396,7 @@ sss_dbus_parse_array(sss_dbus_ctx *ctx, done: if (ret != SSS_DBUS_OK) { if (attr->type == SSS_DBUS_ATTR_TYPE_STRING && attr->data.str != NULL) { - int i; + unsigned int i; for (i = 0; attr->data.str[i] != NULL && i < attr->num_values; i++) { _free(ctx, attr->data.str[i]); @@ -404,7 +404,7 @@ done: _free(ctx, attr->data.str); } else if (attr->type == SSS_DBUS_ATTR_TYPE_STRING_DICT && attr->data.str_dict != NULL) { - int i, j; + unsigned int i, j; for (i = 0; attr->data.str_dict[i].key != NULL; i++) { for (j = 0; j < attr->data.str_dict[i].num_values; j++) { -- 1.9.0