# HG changeset patch # User Paul Aurich # Date 1229488380 0 # Node ID d5b1fede10a03d96e9e572462e0900530f7b7c17 # Parent 6bdcdb77ce775da611d929f6ff11c53a93885794 Rename a few variables diff -r 6bdcdb77ce77 -r d5b1fede10a0 libpurple/protocols/jabber/caps.c --- a/libpurple/protocols/jabber/caps.c Mon Dec 15 20:43:02 2008 +0000 +++ b/libpurple/protocols/jabber/caps.c Wed Dec 17 04:33:00 2008 +0000 @@ -59,11 +59,11 @@ } JabberCapsValue; #endif -static guint jabber_caps_hash(gconstpointer key) { - const JabberCapsKey *name = key; - guint nodehash = g_str_hash(name->node); - guint verhash = g_str_hash(name->ver); - guint hashhash = g_str_hash(name->hash); +static guint jabber_caps_hash(gconstpointer data) { + const JabberCapsKey *key = data; + guint nodehash = g_str_hash(key->node); + guint verhash = g_str_hash(key->ver); + guint hashhash = g_str_hash(key->hash); return nodehash ^ verhash ^ hashhash; } @@ -76,12 +76,12 @@ strcmp(name1->hash, name2->hash) == 0; } -void jabber_caps_destroy_key(gpointer key) { - JabberCapsKey *keystruct = key; - g_free(keystruct->node); - g_free(keystruct->ver); - g_free(keystruct->hash); - g_free(keystruct); +void jabber_caps_destroy_key(gpointer data) { + JabberCapsKey *key = data; + g_free(key->node); + g_free(key->ver); + g_free(key->hash); + g_free(key); } void