diff options
Diffstat (limited to 'binding/bluetooth-util.c')
| -rw-r--r-- | binding/bluetooth-util.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/binding/bluetooth-util.c b/binding/bluetooth-util.c index a70de5d..a1e15f0 100644 --- a/binding/bluetooth-util.c +++ b/binding/bluetooth-util.c @@ -167,7 +167,7 @@ json_object *simple_gvariant_to_json(GVariant *var, json_object *parent, break; case G_VARIANT_CLASS_INT64: i64 = g_variant_get_int64(var); - if (i64 >= -(1L << 31) && i64 < (1L << 31)) + if (i64 >= -(1LL << 31) && i64 < (1LL << 31)) obj = json_object_new_int((int)i64); else obj = json_object_new_int64(i64); @@ -288,7 +288,7 @@ json_object *simple_gvariant_to_json(GVariant *var, json_object *parent, g_variant_iter_init(&iter, var); nitems = g_variant_iter_n_children(&iter); if (nitems != 1) { - AFB_WARNING("Can't handle variants with more than one children (%lu)", nitems); + AFB_WARNING("Can't handle variants with more than one children (%zu)", nitems); break; } @@ -1047,8 +1047,11 @@ gchar *return_bluez_path(afb_req_t request) { const char *adapter = afb_req_value(request, "adapter"); const char *device, *tmp; + if (!ns || (!adapter && !ns->adapter)) + return NULL; + call_work_lock(ns); - adapter = adapter ? adapter : ns->default_adapter; + adapter = adapter ? adapter : ns->adapter; call_work_unlock(ns); device = afb_req_value(request, "device"); |