diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-12-31 17:19:30 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-12-31 17:19:30 +0000 |
| commit | a66c19d9111dc950aac47b7becaddf1b0814f251 (patch) | |
| tree | d41fa5db75db93ba2e2c492ea609d0fdedaa5233 | |
| parent | 9099211ddf545d21aca5177f94a99f9ef49707b2 (diff) | |
remove yet another occurence of dbus_message_iter_get_array_len() due to obsolescence (similar in style to r1357)
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1360 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
| -rw-r--r-- | avahi-client/resolver.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/avahi-client/resolver.c b/avahi-client/resolver.c index 2d9f808..4403a12 100644 --- a/avahi-client/resolver.c +++ b/avahi-client/resolver.c @@ -106,6 +106,8 @@ DBusHandlerResult avahi_service_resolver_event (AvahiClient *client, AvahiResolv for (;;) { DBusMessageIter sub2; int at; + const uint8_t *k; + int n; if ((at = dbus_message_iter_get_arg_type(&sub)) == DBUS_TYPE_INVALID) break; @@ -119,13 +121,10 @@ DBusHandlerResult avahi_service_resolver_event (AvahiClient *client, AvahiResolv dbus_message_iter_recurse(&sub, &sub2); - if (dbus_message_iter_get_array_len(&sub2) > 0) { - uint8_t *k; - int n; - - dbus_message_iter_get_fixed_array(&sub2, &k, &n); + k = NULL; n = 0; + dbus_message_iter_get_fixed_array(&sub2, &k, &n); + if (k && n > 0) strlst = avahi_string_list_add_arbitrary(strlst, k, n); - } dbus_message_iter_next(&sub); } |