[gtk+] broadway: Define variables where they are used
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] broadway: Define variables where they are used
- Date: Wed, 3 Feb 2016 22:08:08 +0000 (UTC)
commit a2ac9524bc8d7be4224331e02aa3ad2d54527e88
Author: Benjamin Otte <otte redhat com>
Date: Wed Feb 3 23:07:05 2016 +0100
broadway: Define variables where they are used
Avoids gcc warnings about unused variables.
gdk/broadway/broadwayd.c | 3 ++-
gdk/broadway/gdkbroadway-server.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gdk/broadway/broadwayd.c b/gdk/broadway/broadwayd.c
index 143f438..9cbde83 100644
--- a/gdk/broadway/broadwayd.c
+++ b/gdk/broadway/broadwayd.c
@@ -416,7 +416,6 @@ main (int argc, char *argv[])
GInetAddress *inet;
GSocketAddress *address;
GSocketService *listener;
- char *path, *basename;
char *http_address = NULL;
char *unixsocket_address = NULL;
int http_port = 0;
@@ -478,6 +477,8 @@ main (int argc, char *argv[])
#ifdef G_OS_UNIX
else if (display[0] == ':' && g_ascii_isdigit(display[1]))
{
+ char *path, *basename;
+
port = strtol (display + strlen (":"), NULL, 10);
basename = g_strdup_printf ("broadway%d.socket", port + 1);
path = g_build_filename (g_get_user_runtime_dir (), basename, NULL);
diff --git a/gdk/broadway/gdkbroadway-server.c b/gdk/broadway/gdkbroadway-server.c
index acfb2de..deb1692 100644
--- a/gdk/broadway/gdkbroadway-server.c
+++ b/gdk/broadway/gdkbroadway-server.c
@@ -95,7 +95,6 @@ GdkBroadwayServer *
_gdk_broadway_server_new (const char *display, GError **error)
{
GdkBroadwayServer *server;
- char *basename;
GSocketClient *client;
GSocketConnection *connection;
GInetAddress *inet;
@@ -103,7 +102,6 @@ _gdk_broadway_server_new (const char *display, GError **error)
GPollableInputStream *pollable;
GInputStream *in;
GSource *source;
- char *path;
char *local_socket_type = NULL;
int port;
@@ -128,6 +126,8 @@ _gdk_broadway_server_new (const char *display, GError **error)
#ifdef G_OS_UNIX
else if (display[0] == ':' && g_ascii_isdigit(display[1]))
{
+ char *path, *basename;
+
port = strtol (display + strlen (":"), NULL, 10);
basename = g_strdup_printf ("broadway%d.socket", port + 1);
path = g_build_filename (g_get_user_runtime_dir (), basename, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]