Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/caps.c @ 25783:d5b1fede10a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename a few variables
author Paul Aurich <paul@darkrain42.org>
date Wed, 17 Dec 2008 04:33:00 +0000
parents 6bdcdb77ce77
children 05693f6885a4
comparison
equal deleted inserted replaced
25782:6bdcdb77ce77 25783:d5b1fede10a0
57 GList *features; /* char * */ 57 GList *features; /* char * */
58 GHashTable *ext; /* char * -> JabberCapsValueExt */ 58 GHashTable *ext; /* char * -> JabberCapsValueExt */
59 } JabberCapsValue; 59 } JabberCapsValue;
60 #endif 60 #endif
61 61
62 static guint jabber_caps_hash(gconstpointer key) { 62 static guint jabber_caps_hash(gconstpointer data) {
63 const JabberCapsKey *name = key; 63 const JabberCapsKey *key = data;
64 guint nodehash = g_str_hash(name->node); 64 guint nodehash = g_str_hash(key->node);
65 guint verhash = g_str_hash(name->ver); 65 guint verhash = g_str_hash(key->ver);
66 guint hashhash = g_str_hash(name->hash); 66 guint hashhash = g_str_hash(key->hash);
67 return nodehash ^ verhash ^ hashhash; 67 return nodehash ^ verhash ^ hashhash;
68 } 68 }
69 69
70 static gboolean jabber_caps_compare(gconstpointer v1, gconstpointer v2) { 70 static gboolean jabber_caps_compare(gconstpointer v1, gconstpointer v2) {
71 const JabberCapsKey *name1 = v1; 71 const JabberCapsKey *name1 = v1;
74 return strcmp(name1->node, name2->node) == 0 && 74 return strcmp(name1->node, name2->node) == 0 &&
75 strcmp(name1->ver, name2->ver) == 0 && 75 strcmp(name1->ver, name2->ver) == 0 &&
76 strcmp(name1->hash, name2->hash) == 0; 76 strcmp(name1->hash, name2->hash) == 0;
77 } 77 }
78 78
79 void jabber_caps_destroy_key(gpointer key) { 79 void jabber_caps_destroy_key(gpointer data) {
80 JabberCapsKey *keystruct = key; 80 JabberCapsKey *key = data;
81 g_free(keystruct->node); 81 g_free(key->node);
82 g_free(keystruct->ver); 82 g_free(key->ver);
83 g_free(keystruct->hash); 83 g_free(key->hash);
84 g_free(keystruct); 84 g_free(key);
85 } 85 }
86 86
87 void 87 void
88 jabber_caps_client_info_ref(JabberCapsClientInfo *info) 88 jabber_caps_client_info_ref(JabberCapsClientInfo *info)
89 { 89 {