summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgitjackolantern <scottjconover@yahoo.com>2020-10-24 22:53:04 -0700
committerGitHub <noreply@github.com>2020-10-24 22:53:04 -0700
commit1a3295611a96441a1d70f23c5187bae9c7c3c835 (patch)
treedaa801dd991cb4b0b21467b040c7ebe90110efce
parente30d58fcc9eb8b7c75e0c358d7046deb7e7cd1a6 (diff)
parent9c11ada43926771785fb50a3ac72d4672dfa0755 (diff)
downloadbluez-tools-1a3295611a96441a1d70f23c5187bae9c7c3c835.tar.gz
Merge pull request #29 from jhnswlhfr/master
remove incorrectly handled error argument from device_* calls in bt-device.c
-rw-r--r--src/bt-device.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/bt-device.c b/src/bt-device.c
index 2b16432..a739b98 100644
--- a/src/bt-device.c
+++ b/src/bt-device.c
@@ -610,18 +610,18 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
- g_print("[%s]\n", device_get_address(device, &error));
- g_print(" Name: %s\n", device_get_name(device, &error));
- g_print(" Alias: %s [rw]\n", device_get_alias(device, &error));
- g_print(" Address: %s\n", device_get_address(device, &error));
- g_print(" Icon: %s\n", device_get_icon(device, &error));
- g_print(" Class: 0x%x\n", device_get_class(device, &error));
- g_print(" Paired: %d\n", device_get_paired(device, &error));
- g_print(" Trusted: %d [rw]\n", device_get_trusted(device, &error));
- g_print(" Blocked: %d [rw]\n", device_get_blocked(device, &error));
- g_print(" Connected: %d\n", device_get_connected(device, &error));
+ g_print("[%s]\n", device_get_address(device, NULL));
+ g_print(" Name: %s\n", device_get_name(device, NULL));
+ g_print(" Alias: %s [rw]\n", device_get_alias(device, NULL));
+ g_print(" Address: %s\n", device_get_address(device, NULL));
+ g_print(" Icon: %s\n", device_get_icon(device, NULL));
+ g_print(" Class: 0x%x\n", device_get_class(device, NULL));
+ g_print(" Paired: %d\n", device_get_paired(device, NULL));
+ g_print(" Trusted: %d [rw]\n", device_get_trusted(device, NULL));
+ g_print(" Blocked: %d [rw]\n", device_get_blocked(device, NULL));
+ g_print(" Connected: %d\n", device_get_connected(device, NULL));
g_print(" UUIDs: [");
- const gchar **uuids = device_get_uuids(device, &error);
+ const gchar **uuids = device_get_uuids(device, NULL);
for (int j = 0; uuids[j] != NULL; j++)
{
if (j > 0) g_print(", ");