summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2011-07-01 13:42:08 +0100
committerDaniel P. Berrange <berrange@redhat.com>2011-07-01 13:42:08 +0100
commitcfdc8055beb83f58cb23bccb739c68ce47b00e64 (patch)
treebfd16fcfa287cdd1a20e9373261068f8e0222fbe /src
parent4c210b712c4a02c467042c7a7f081276f7e3644e (diff)
downloadvirt-viewer-cfdc8055beb83f58cb23bccb739c68ce47b00e64.tar.gz
virt-viewer-cfdc8055beb83f58cb23bccb739c68ce47b00e64.tar.xz
virt-viewer-cfdc8055beb83f58cb23bccb739c68ce47b00e64.zip
Fix some compile warnings
Diffstat (limited to 'src')
-rw-r--r--src/view/drawer.c3
-rw-r--r--src/viewer.c8
2 files changed, 8 insertions, 3 deletions
diff --git a/src/view/drawer.c b/src/view/drawer.c
index aec0728..43b7e1a 100644
--- a/src/view/drawer.c
+++ b/src/view/drawer.c
@@ -67,7 +67,7 @@ static ViewOvBoxClass *parentClass;
static void
ViewDrawerInit(GTypeInstance *instance, // IN
- gpointer klass) // Unused
+ gpointer klass G_GNUC_UNUSED) // Unused
{
ViewDrawer *that;
@@ -175,6 +175,7 @@ ViewDrawer_GetType(void)
sizeof (ViewDrawer),
0, /* n_preallocs */
(GInstanceInitFunc)ViewDrawerInit,
+ NULL
};
type = g_type_register_static(VIEW_TYPE_OV_BOX, "ViewDrawer", &info, 0);
diff --git a/src/viewer.c b/src/viewer.c
index 577f6bb..27ea056 100644
--- a/src/viewer.c
+++ b/src/viewer.c
@@ -931,9 +931,9 @@ cleanup:
return retval;
}
+#if defined(HAVE_SOCKETPAIR) && defined(HAVE_FORK)
void viewer_channel_open_fd(VirtViewer *viewer, VirtViewerDisplayChannel *channel)
{
-#if defined(HAVE_SOCKETPAIR) && defined(HAVE_FORK)
int fd = -1;
g_return_if_fail(viewer != NULL);
@@ -949,10 +949,14 @@ void viewer_channel_open_fd(VirtViewer *viewer, VirtViewerDisplayChannel *channe
if (fd >= 0)
virt_viewer_display_channel_open_fd(viewer->display, channel, fd);
+}
#else
+void viewer_channel_open_fd(VirtViewer *viewer G_GNUC_UNUSED,
+ VirtViewerDisplayChannel *channel G_GNUC_UNUSED)
+{
viewer_simple_message_dialog(viewer->window, _("Connect to channel unsupported."));
-#endif
}
+#endif
static int viewer_activate(VirtViewer *viewer,
virDomainPtr dom)