Attachment 64016 Details for Bug 51906 – Patch to rename variables

[patch] Patch to rename variables

0001-Renamed-variables-to-avoid-warnings-with-Werror-shad.patch (text/plain), 4.21 KB, created by Thomas Thurman on 2012-07-09 11:26:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Thurman

Created: 2012-07-09 11:26:58 UTC

Size: 4.21 KB

patch

obsolete

>From 6c52941e3d21849dc7cdda1a9c27c1ec21a1d46e Mon Sep 17 00:00:00 2001
>From: Thomas Thurman <thomas@thurman.org.uk>
>Date: Mon, 9 Jul 2012 12:11:12 +0100
>Subject: [PATCH] Renamed variables to avoid warnings with "-Werror=shadow".
>
>idle-parser.c: renamed "link" to "link_".
>idle-server-connection.c: renamed "socket" to "socket_".
>---
> src/idle-parser.c            |   26 +++++++++++++-------------
> src/idle-server-connection.c |    8 ++++----
> 2 files changed, 17 insertions(+), 17 deletions(-)
>
>diff --git a/src/idle-parser.c b/src/idle-parser.c
>index eb77086..1a750fd 100644
>--- a/src/idle-parser.c
>+++ b/src/idle-parser.c
>@@ -180,10 +180,10 @@ static void idle_parser_finalize(GObject *obj) {
> 	int i;
> 
> 	for (i = 0; i < IDLE_PARSER_LAST_MESSAGE_CODE; i++) {
>-		GSList *link;
>+		GSList *link_;
> 
>-		for (link = priv->handlers[i]; link != NULL; link = link->next)
>-			g_slice_free(MessageHandlerClosure, link->data);
>+		for (link_ = priv->handlers[i]; link_ != NULL; link_ = link_->next)
>+			g_slice_free(MessageHandlerClosure, link_->data);
> 
> 		g_slist_free(priv->handlers[i]);
> 	}
>@@ -297,10 +297,10 @@ void idle_parser_remove_handlers_by_data(IdleParser *parser, gpointer user_data)
> 	int i;
> 
> 	for (i = 0; i < IDLE_PARSER_LAST_MESSAGE_CODE; i++) {
>-		GSList *link;
>+		GSList *link_;
> 
>-		while ((link = g_slist_find_custom(priv->handlers[i], user_data, _message_handler_closure_user_data_compare)))
>-			priv->handlers[i] = g_slist_remove_link(priv->handlers[i], link);
>+		while ((link_ = g_slist_find_custom(priv->handlers[i], user_data, _message_handler_closure_user_data_compare)))
>+			priv->handlers[i] = g_slist_remove_link(priv->handlers[i], link_);
> 	}
> }
> 
>@@ -365,7 +365,7 @@ static void _parse_message(IdleParser *parser, const gchar *split_msg) {
> static void _parse_and_forward_one(IdleParser *parser, gchar **tokens, IdleParserMessageCode code, const gchar *format) {
> 	IdleParserPrivate *priv = IDLE_PARSER_GET_PRIVATE(parser);
> 	GValueArray *args = g_value_array_new(3);
>-	GSList *link = priv->handlers[code];
>+	GSList *link_ = priv->handlers[code];
> 	IdleParserHandlerResult result = IDLE_PARSER_HANDLER_RESULT_NOT_HANDLED;
> 	gboolean success = TRUE;
> 	gchar **iter = tokens;
>@@ -449,18 +449,18 @@ static void _parse_and_forward_one(IdleParser *parser, gchar **tokens, IdleParse
> 
> 	IDLE_DEBUG("successfully parsed");
> 
>-	while (link) {
>-		MessageHandlerClosure *closure = link->data;
>+	while (link_) {
>+		MessageHandlerClosure *closure = link_->data;
> 		result = closure->handler(parser, code, args, closure->user_data);
> 		if (result == IDLE_PARSER_HANDLER_RESULT_NOT_HANDLED) {
>-			link = link->next;
>+			link_ = link_->next;
> 		} else if (result == IDLE_PARSER_HANDLER_RESULT_HANDLED) {
> 			break;
> 		} else if (result == IDLE_PARSER_HANDLER_RESULT_NO_MORE_PLEASE) {
>-			GSList *tmp = link->next;
>+			GSList *tmp = link_->next;
> 			g_free(closure);
>-			priv->handlers[code] = g_slist_remove_link(priv->handlers[code], link);
>-			link = tmp;
>+			priv->handlers[code] = g_slist_remove_link(priv->handlers[code], link_);
>+			link_ = tmp;
> 		} else {
> 			g_assert_not_reached();
> 		}
>diff --git a/src/idle-server-connection.c b/src/idle-server-connection.c
>index e131903..64cb766 100644
>--- a/src/idle-server-connection.c
>+++ b/src/idle-server-connection.c
>@@ -258,7 +258,7 @@ static void _connect_to_host_ready(GObject *source_object, GAsyncResult *res, gp
> 	IdleServerConnection *conn = IDLE_SERVER_CONNECTION(g_async_result_get_source_object(G_ASYNC_RESULT(result)));
> 	IdleServerConnectionPrivate *priv = IDLE_SERVER_CONNECTION_GET_PRIVATE(conn);
> 	GInputStream *input_stream;
>-	GSocket *socket;
>+	GSocket *socket_;
> 	GSocketConnection *socket_connection;
> 	gint nodelay = 1;
> 	gint socket_fd;
>@@ -274,10 +274,10 @@ static void _connect_to_host_ready(GObject *source_object, GAsyncResult *res, gp
> 		goto cleanup;
> 	}
> 
>-	socket = g_socket_connection_get_socket(socket_connection);
>-	g_socket_set_keepalive(socket, TRUE);
>+	socket_ = g_socket_connection_get_socket(socket_connection);
>+	g_socket_set_keepalive(socket_, TRUE);
> 
>-	socket_fd = g_socket_get_fd(socket);
>+	socket_fd = g_socket_get_fd(socket_);
> 	setsockopt(socket_fd, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay));
> 
> 	g_tcp_connection_set_graceful_disconnect(G_TCP_CONNECTION(socket_connection), TRUE);
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 51906: 64016

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.