summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDavid Zeuthen <zeuthen@gmail.com>2012-07-06 13:33:48 -0400
committerDavid Zeuthen <zeuthen@gmail.com>2012-07-06 13:33:48 -0400
commit1114354bb1cc90aa13f0c71d6646f166768c02b0 (patch)
tree70e3d7de0c04756c623659d23c6ab35daf9244c2 /tools
parent5207c93dbb17dbc12b47a9db932ce75b55126d50 (diff)
Add more compiler warnings
You'd think GNOME_COMPILE_WARNINGS([maximum]) would be good enough but apparently not. I hate build systems. Signed-off-by: David Zeuthen <zeuthen@gmail.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/udisksctl.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/udisksctl.c b/tools/udisksctl.c
index 3dd9203..97b0f17 100644
--- a/tools/udisksctl.c
+++ b/tools/udisksctl.c
@@ -451,13 +451,13 @@ lookup_object_by_drive (const gchar *drive)
for (l = objects; l != NULL; l = l->next)
{
UDisksObject *object = UDISKS_OBJECT (l->data);
- UDisksDrive *drive;
+ UDisksDrive *drive_iface;
if (g_strcmp0 (g_dbus_object_get_object_path (G_DBUS_OBJECT (object)), full_drive_object_path) != 0)
continue;
- drive = udisks_object_peek_drive (object);
- if (drive != NULL)
+ drive_iface = udisks_object_peek_drive (object);
+ if (drive_iface != NULL)
{
ret = g_object_ref (object);
goto out;
@@ -2768,17 +2768,17 @@ handle_command_status (gint *argc,
blocks = find_blocks_for_drive (objects, g_dbus_object_get_object_path (G_DBUS_OBJECT (object)));
for (j = blocks; j != NULL; j = j->next)
{
- UDisksBlock *block = UDISKS_BLOCK (j->data);
+ UDisksBlock *block_iface = UDISKS_BLOCK (j->data);
GDBusObject *block_object;
UDisksPartition *partition;
- block_object = g_dbus_interface_get_object (G_DBUS_INTERFACE (block));
+ block_object = g_dbus_interface_get_object (G_DBUS_INTERFACE (block_iface));
partition = block_object == NULL ? NULL : udisks_object_peek_partition (UDISKS_OBJECT (block_object));
if (partition == NULL)
{
const gchar *device_file;
if (str->len > 0)
g_string_append (str, " ");
- device_file = udisks_block_get_device (block);
+ device_file = udisks_block_get_device (block_iface);
if (g_str_has_prefix (device_file, "/dev/"))
g_string_append (str, device_file + 5);
else