signal = dbus_message_new_signal(NM_PATH, NM_INTERFACE,
"StateChanged");
- if (signal == NULL)
+ if (!signal)
return;
dbus_message_append_args(signal, DBUS_TYPE_UINT32, &state,
signal = dbus_message_new_signal(NM_PATH, NM_INTERFACE,
"PropertiesChanged");
- if (signal == NULL)
+ if (!signal)
return;
dbus_message_iter_init_append(signal, &iter);
{
DBG("service %p", service);
- if (service == NULL)
+ if (!service)
nm_state = NM_STATE_DISCONNECTED;
else
nm_state = NM_STATE_CONNECTED_LOCAL;
{
DBG("service %p state %d", service, state);
- if (current_service == NULL || current_service != service)
+ if (!current_service || current_service != service)
return;
switch (state) {
properties_changed(nm_state);
}
-static void offline_mode(connman_bool_t enabled)
+static void offline_mode(bool enabled)
{
DBG("enabled %d", enabled);
- if (enabled == TRUE)
+ if (enabled)
nm_state = NM_STATE_ASLEEP;
else
nm_state = NM_STATE_DISCONNECTED;
DBG("interface %s property %s", interface, key);
- if (g_str_equal(interface, NM_INTERFACE) == FALSE)
+ if (!g_str_equal(interface, NM_INTERFACE))
return dbus_message_new_error(msg, DBUS_ERROR_FAILED,
"Unsupported interface");
- if (g_str_equal(key, "State") == TRUE) {
+ if (g_str_equal(key, "State")) {
DBusMessage *reply;
DBusMessageIter iter, value;
DBG("state %d", nm_state);
reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
+ if (!reply)
return NULL;
dbus_message_iter_init_append(reply, &iter);
}
static const GDBusMethodTable methods[] = {
- { "Get", "ss", "v", property_get },
+ { GDBUS_METHOD("Get",
+ GDBUS_ARGS({ "interface", "s" }, { "key", "s" }),
+ GDBUS_ARGS({ "property", "v" }), property_get) },
{ },
};
static const GDBusSignalTable signals[] = {
- { "PropertiesChanged", "a{sv}" },
- { "StateChanged", "u" },
+ { GDBUS_SIGNAL("PropertiesChanged",
+ GDBUS_ARGS({ "properties", "a{sv}" })) },
+ { GDBUS_SIGNAL("StateChanged",
+ GDBUS_ARGS({ "state", "u" })) },
{ },
};
DBG("");
connection = connman_dbus_get_connection();
- if (connection == NULL)
+ if (!connection)
return -1;
- if (g_dbus_request_name(connection, NM_SERVICE, NULL) == FALSE) {
+ if (!g_dbus_request_name(connection, NM_SERVICE, NULL)) {
connman_error("nmcompat: failed to register service");
return -1;
}
return -1;
}
- if (g_dbus_register_interface(connection, NM_PATH,
- DBUS_PROPERTIES_INTERFACE,
- methods, signals, NULL, NULL, NULL) == FALSE) {
+ if (!g_dbus_register_interface(connection, NM_PATH,
+ DBUS_PROPERTIES_INTERFACE, methods,
+ signals, NULL, NULL, NULL)) {
connman_error("nmcompat: failed to register "
DBUS_PROPERTIES_INTERFACE);
return -1;
connman_notifier_unregister(¬ifier);
- if (connection == NULL)
+ if (!connection)
return;
g_dbus_unregister_interface(connection, NM_PATH,