linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Inga Stotland <ingas@codeaurora.org>
To: linux-bluetooth@vger.kernel.org
Cc: rshaffer@codeaurora.org, johan.hedberg@gmail.com,
	marcel@holtmann.org, Inga Stotland <ingas@codeaurora.org>
Subject: [PATCH 5/6] Handle arrays in device properties dictionary
Date: Sat, 31 Jul 2010 04:45:11 -0700	[thread overview]
Message-ID: <1280576713-1398-6-git-send-email-ingas@codeaurora.org> (raw)
In-Reply-To: <1280576713-1398-1-git-send-email-ingas@codeaurora.org>

---
 src/adapter.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index af60495..2560440 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2700,6 +2700,7 @@ static void append_dict_valist(DBusMessageIter *iter,
 	DBusMessageIter dict;
 	const char *key;
 	int type;
+	int n_elements;
 	void *val;
 
 	dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY,
@@ -2711,7 +2712,12 @@ static void append_dict_valist(DBusMessageIter *iter,
 	while (key) {
 		type = va_arg(var_args, int);
 		val = va_arg(var_args, void *);
-		dict_append_entry(&dict, key, type, val);
+		if (type == DBUS_TYPE_ARRAY) {
+			n_elements = va_arg(var_args, int);
+			if (n_elements > 0)
+				dict_append_array(&dict, key, DBUS_TYPE_STRING, val, n_elements);
+		} else
+			dict_append_entry(&dict, key, type, val);
 		key = va_arg(var_args, char *);
 	}
 
-- 
1.7.2

-- 
Inga Stotland
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

  parent reply	other threads:[~2010-07-31 11:45 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-31 11:45 [PATCH v5 0/6] Enhanced support for extended inquiry response Inga Stotland
2010-07-31 11:45 ` [PATCH 1/6] Spec constants for Extended Inquiry Response field types Inga Stotland
2010-07-31 11:45 ` [PATCH 2/6] Clean up code that generates extended inquiry response Inga Stotland
2010-08-03  8:12   ` Johan Hedberg
2010-08-03 15:37     ` ingas
2010-08-03 16:26       ` Johan Hedberg
2010-07-31 11:45 ` [PATCH 3/6] Support for adding UUID128 to " Inga Stotland
2010-08-03  8:18   ` Johan Hedberg
2010-07-31 11:45 ` [PATCH 4/6] Fix in logic to write EIR when SDP records are changed Inga Stotland
2010-08-03  8:23   ` Johan Hedberg
2010-07-31 11:45 ` Inga Stotland [this message]
2010-07-31 11:45 ` [PATCH 6/6] Support for generating dictionary value of service UUIDs Inga Stotland
2010-08-03  8:36   ` Johan Hedberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1280576713-1398-6-git-send-email-ingas@codeaurora.org \
    --to=ingas@codeaurora.org \
    --cc=johan.hedberg@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=marcel@holtmann.org \
    --cc=rshaffer@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).