fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-05-05 09:58:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix up a few problems spotted by clang

Browse source
This commit is contained in:
Richard Hughes 2009-09-11 14:37:51 +01:00
parent 2f211aa7a7
commit 97a7824844
6 changed files with 41 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/dkp-daemon.c
View file

@ -483,9 +483,8 @@ out:
static gboolean
dkp_daemon_register_power_daemon (DkpDaemon *daemon)
{
DBusConnection *connection;
DBusError dbus_error;
GError *error = NULL;
gboolean ret = FALSE;
daemon->priv->connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
if (daemon->priv->connection == NULL) {
@ -493,28 +492,24 @@ dkp_daemon_register_power_daemon (DkpDaemon *daemon)
g_critical ("error getting system bus: %s", error->message);
g_error_free (error);
}
goto error;
goto out;
}
connection = dbus_g_connection_get_connection (daemon->priv->connection);
/* connect to DBUS */
daemon->priv->proxy = dbus_g_proxy_new_for_name (daemon->priv->connection,
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS);
/* register GObject */
dbus_g_connection_register_g_object (daemon->priv->connection,
"/org/freedesktop/DeviceKit/Power",
G_OBJECT (daemon));
daemon->priv->proxy = dbus_g_proxy_new_for_name (daemon->priv->connection,
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS);
dbus_error_init (&dbus_error);
if (dbus_error_is_set (&dbus_error)) {
egg_warning ("Cannot add match rule: %s: %s", dbus_error.name, dbus_error.message);
dbus_error_free (&dbus_error);
goto error;
}
return TRUE;
error:
return FALSE;
/* success */
ret = TRUE;
out:
return ret;
}
/**

3
src/linux/dkp-device-csr.c
View file

@ -73,11 +73,10 @@ static gboolean dkp_device_csr_refresh (DkpDevice *device);
static gboolean
dkp_device_csr_poll_cb (DkpDeviceCsr *csr)
{
gboolean ret;
DkpDevice *device = DKP_DEVICE (csr);
egg_debug ("Polling: %s", dkp_device_get_object_path (device));
ret = dkp_device_csr_refresh (device);
dkp_device_csr_refresh (device);
/* always continue polling */
return TRUE;

3
src/linux/dkp-device-hid.c
View file

@ -132,11 +132,10 @@ out:
static gboolean
dkp_device_hid_poll (DkpDeviceHid *hid)
{
gboolean ret;
DkpDevice *device = DKP_DEVICE (hid);
egg_debug ("Polling: %s", dkp_device_get_object_path (device));
ret = dkp_device_hid_refresh (device);
dkp_device_hid_refresh (device);
/* always continue polling */
return TRUE;

3
src/linux/dkp-device-supply.c
View file

@ -608,12 +608,11 @@ out:
static gboolean
dkp_device_supply_poll_battery (DkpDeviceSupply *supply)
{
gboolean ret;
DkpDevice *device = DKP_DEVICE (supply);
egg_debug ("No updates on supply %s for %i seconds; forcing update", dkp_device_get_object_path (device), DKP_DEVICE_SUPPLY_REFRESH_TIMEOUT);
supply->priv->poll_timer_id = 0;
ret = dkp_device_supply_refresh (device);
dkp_device_supply_refresh (device);
/* never repeat */
return FALSE;

9
src/linux/dkp-device-wup.c
View file

@ -85,11 +85,10 @@ static gboolean dkp_device_wup_refresh (DkpDevice *device);
static gboolean
dkp_device_wup_poll_cb (DkpDeviceWup *wup)
{
gboolean ret;
DkpDevice *device = DKP_DEVICE (wup);
egg_debug ("Polling: %s", dkp_device_get_object_path (device));
ret = dkp_device_wup_refresh (device);
dkp_device_wup_refresh (device);
/* always continue polling */
return TRUE;
@ -335,10 +334,14 @@ dkp_device_wup_coldplug (DkpDevice *device)
/* attempt to clear */
ret = dkp_device_wup_write_command (wup, "#R,W,0;");
if (!ret)
egg_debug ("failed to clear, nonfatal");
/* setup logging interval */
data = g_strdup_printf ("#L,W,3,E,1,%i;", DKP_DEVICE_WUP_REFRESH_TIMEOUT);
ret = dkp_device_wup_write_command (wup, data);
if (!ret)
egg_debug ("failed to setup logging interval, nonfatal");
g_free (data);
/* dummy read */
@ -373,7 +376,7 @@ dkp_device_wup_coldplug (DkpDevice *device)
/* coldplug */
egg_debug ("coldplug");
ret = dkp_device_wup_refresh (device);
dkp_device_wup_refresh (device);
/* hardcode true, as we'll retry later if busy */
ret = TRUE;

26
tools/dkp-tool.c
View file

@ -193,7 +193,7 @@ out:
int
main (int argc, char **argv)
{
gint retval = 1;
gint retval = EXIT_FAILURE;
guint i;
GOptionContext *context;
gboolean verbose = FALSE;
@ -245,9 +245,14 @@ main (int argc, char **argv)
goto out;
}
/* wakeups */
if (opt_wakeups) {
dkp_tool_show_wakeups ();
} else if (opt_enumerate || opt_dump) {
retval = EXIT_SUCCESS;
goto out;
}
if (opt_enumerate || opt_dump) {
GPtrArray *devices;
devices = dkp_client_enumerate_devices (client, &error);
if (devices == NULL) {
@ -270,10 +275,18 @@ main (int argc, char **argv)
g_print ("Daemon:\n");
dkp_client_print (client);
}
} else if (opt_monitor || opt_monitor_detail) {
retval = EXIT_SUCCESS;
goto out;
}
if (opt_monitor || opt_monitor_detail) {
if (!dkp_tool_do_monitor (client))
goto out;
} else if (opt_show_info != NULL) {
retval = EXIT_SUCCESS;
goto out;
}
if (opt_show_info != NULL) {
device = dkp_device_new ();
ret = dkp_device_set_object_path (device, opt_show_info, &error);
if (!ret) {
@ -281,12 +294,11 @@ main (int argc, char **argv)
g_error_free (error);
} else {
dkp_device_print (device);
retval = 0;
}
g_object_unref (device);
retval = EXIT_SUCCESS;
goto out;
}
retval = 0;
out:
g_object_unref (client);
return retval;