From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCHv4 2/8] android/haltest: Use pointer as parameter for debug
Date: Wed, 30 Oct 2013 14:16:40 +0200 [thread overview]
Message-ID: <1383135406-23658-3-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1383135406-23658-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Pass structure as pointer. This makes it consistent with the rest of
the code and helps to reuse this function in other parts.
---
android/client/if-bt.c | 2 +-
android/client/textconv.c | 36 ++++++++++++++++++------------------
android/client/textconv.h | 2 +-
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/android/client/if-bt.c b/android/client/if-bt.c
index e9edec5..cbb828b 100644
--- a/android/client/if-bt.c
+++ b/android/client/if-bt.c
@@ -74,7 +74,7 @@ static void dump_properties(int num_properties, bt_property_t *properties)
bt_property_t prop;
memcpy(&prop, properties + i, sizeof(prop));
- haltest_info("prop: %s\n", btproperty2str(prop));
+ haltest_info("prop: %s\n", btproperty2str(&prop));
}
}
diff --git a/android/client/textconv.c b/android/client/textconv.c
index 8f27948..1dc6ad0 100644
--- a/android/client/textconv.c
+++ b/android/client/textconv.c
@@ -241,52 +241,52 @@ static char *btuuid2str(const bt_uuid_t *uuid)
return bt_uuid_t2str(uuid, buf);
}
-char *btproperty2str(bt_property_t property)
+char *btproperty2str(const bt_property_t *property)
{
static char buf[4096];
char *p;
p = buf + sprintf(buf, "type=%s len=%d val=",
- bt_property_type_t2str(property.type),
- property.len);
+ bt_property_type_t2str(property->type),
+ property->len);
- switch (property.type) {
+ switch (property->type) {
case BT_PROPERTY_BDNAME:
case BT_PROPERTY_REMOTE_FRIENDLY_NAME:
- sprintf(p, "%*s", property.len,
- ((bt_bdname_t *) property.val)->name);
+ sprintf(p, "%*s", property->len,
+ ((bt_bdname_t *) property->val)->name);
break;
case BT_PROPERTY_BDADDR:
- sprintf(p, "%s", bdaddr2str((bt_bdaddr_t *) property.val));
+ sprintf(p, "%s", bdaddr2str((bt_bdaddr_t *) property->val));
break;
case BT_PROPERTY_CLASS_OF_DEVICE:
- sprintf(p, "%06x", *((int *) property.val));
+ sprintf(p, "%06x", *((int *) property->val));
break;
case BT_PROPERTY_TYPE_OF_DEVICE:
sprintf(p, "%s", bt_device_type_t2str(
- *((bt_device_type_t *) property.val)));
+ *((bt_device_type_t *) property->val)));
break;
case BT_PROPERTY_REMOTE_RSSI:
- sprintf(p, "%d", *((char *) property.val));
+ sprintf(p, "%d", *((char *) property->val));
break;
case BT_PROPERTY_ADAPTER_SCAN_MODE:
sprintf(p, "%s",
- bt_scan_mode_t2str(*((bt_scan_mode_t *) property.val)));
+ bt_scan_mode_t2str(*((bt_scan_mode_t *) property->val)));
break;
case BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT:
- sprintf(p, "%d", *((int *) property.val));
+ sprintf(p, "%d", *((int *) property->val));
break;
case BT_PROPERTY_ADAPTER_BONDED_DEVICES:
{
- int count = property.len / sizeof(bt_bdaddr_t);
- char *ptr = property.val;
+ int count = property->len / sizeof(bt_bdaddr_t);
+ char *ptr = property->val;
strcat(p, "{");
@@ -304,8 +304,8 @@ char *btproperty2str(bt_property_t property)
case BT_PROPERTY_UUIDS:
{
- int count = property.len / sizeof(bt_uuid_t);
- char *ptr = property.val;
+ int count = property->len / sizeof(bt_uuid_t);
+ char *ptr = property->val;
strcat(p, "{");
@@ -323,7 +323,7 @@ char *btproperty2str(bt_property_t property)
case BT_PROPERTY_SERVICE_RECORD:
{
- bt_service_record_t *rec = property.val;
+ bt_service_record_t *rec = property->val;
sprintf(p, "{%s, %d, %s}", btuuid2str(&rec->uuid),
rec->channel, rec->name);
@@ -331,7 +331,7 @@ char *btproperty2str(bt_property_t property)
break;
default:
- sprintf(p, "%p", property.val);
+ sprintf(p, "%p", property->val);
}
return buf;
diff --git a/android/client/textconv.h b/android/client/textconv.h
index 89b29c6..1c848ef 100644
--- a/android/client/textconv.h
+++ b/android/client/textconv.h
@@ -107,7 +107,7 @@ void str2bt_bdaddr_t(const char *str, bt_bdaddr_t *bd_addr);
char *bt_uuid_t2str(const bt_uuid_t *uuid, char *buf);
void str2bt_uuid_t(const char *str, bt_uuid_t *uuid);
-char *btproperty2str(bt_property_t property);
+char *btproperty2str(const bt_property_t *property);
char *bdaddr2str(const bt_bdaddr_t *bd_addr);
DECINTMAP(bt_status_t);
--
1.7.10.4
next prev parent reply other threads:[~2013-10-30 12:16 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-29 12:57 [PATCHv3 0/9] Improve logging for Android Andrei Emeltchenko
2013-10-29 12:57 ` [PATCHv3 1/9] android/haltest: Export print property Andrei Emeltchenko
2013-10-29 12:57 ` [PATCHv3 2/9] android/haltest: Use pointer as parameter for debug Andrei Emeltchenko
2013-10-29 12:57 ` [PATCHv3 3/9] android/hal: Print full property in debug Andrei Emeltchenko
2013-10-29 12:57 ` [PATCHv3 4/9] android/hal: Add extra logs Andrei Emeltchenko
2013-10-29 12:57 ` [PATCHv3 5/9] android/hal: Print adapter state Andrei Emeltchenko
2013-10-29 12:57 ` [PATCHv3 6/9] android/hal: Print adapter property in callback Andrei Emeltchenko
2013-10-29 12:57 ` [PATCHv3 7/9] android: Add thread-safe helpers Andrei Emeltchenko
2013-10-29 12:57 ` [PATCHv3 8/9] android: Use " Andrei Emeltchenko
2013-10-29 12:57 ` [PATCHv3 9/9] android: Fix build errors Andrei Emeltchenko
2013-10-30 12:16 ` [PATCHv4 0/8] Improve logging for Android Andrei Emeltchenko
2013-10-30 12:16 ` [PATCHv4 1/8] android/haltest: Export print property Andrei Emeltchenko
2013-10-30 12:16 ` Andrei Emeltchenko [this message]
2013-10-30 12:16 ` [PATCHv4 3/8] android/hal: Print full property in debug Andrei Emeltchenko
2013-10-30 12:16 ` [PATCHv4 4/8] android/hal: Add extra logs Andrei Emeltchenko
2013-10-30 12:16 ` [PATCHv4 5/8] android/hal: Print adapter state Andrei Emeltchenko
2013-10-30 12:16 ` [PATCHv4 6/8] android/hal: Print adapter property in callback Andrei Emeltchenko
2013-10-30 12:16 ` [PATCHv4 7/8] android: Add thread-safe helpers Andrei Emeltchenko
2013-10-30 12:16 ` [PATCHv4 8/8] android: Use " Andrei Emeltchenko
2013-11-01 15:19 ` [PATCHv5 0/7] Improve logging for Android Andrei Emeltchenko
2013-11-01 15:19 ` [PATCHv5 1/7] android/haltest: Export print property Andrei Emeltchenko
2013-11-01 15:19 ` [PATCHv5 2/7] android/haltest: Use pointer as parameter for debug Andrei Emeltchenko
2013-11-01 15:19 ` [PATCHv5 3/7] android/haltest: Fix print device name Andrei Emeltchenko
2013-11-01 15:19 ` [PATCHv5 4/7] android/hal: Add extra logs to HAL Andrei Emeltchenko
2013-11-01 15:19 ` [PATCHv5 5/7] android: Add thread-safe helpers Andrei Emeltchenko
2013-11-01 15:19 ` [PATCHv5 6/7] android: Use " Andrei Emeltchenko
2013-11-01 15:19 ` [PATCHv5 7/7] android/daemon: Add logs to trace failed cmd Andrei Emeltchenko
2013-11-04 7:34 ` [PATCHv5 0/7] Improve logging for Android 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=1383135406-23658-3-git-send-email-Andrei.Emeltchenko.news@gmail.com \
--to=andrei.emeltchenko.news@gmail.com \
--cc=linux-bluetooth@vger.kernel.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