pidgin3: comparison libpurple/protocols/jabber/caps.c

-:6c1375ed1e59
+:fa8eb96a2544
 typedef struct _JabberDataFormField {
 	gchar *var;
 	GList *values;
 } JabberDataFormField;
-typedef struct _JabberCapsKey {
+static GHashTable *capstable = NULL; /* JabberCapsTuple -> JabberCapsClientInfo */
-	char *node;
-	char *ver;
-	char *hash;
-} JabberCapsKey;
-static GHashTable *capstable = NULL; /* JabberCapsKey -> JabberCapsClientInfo */
 static GHashTable *nodetable = NULL; /* char *node -> JabberCapsNodeExts */
 static guint       save_timer = 0;
 /**
 *	Processes a query-node and returns a JabberCapsClientInfo object with all relevant info.
 	g_hash_table_destroy(exts->exts);
 	g_free(exts);
 }
 static guint jabber_caps_hash(gconstpointer data) {
-	const JabberCapsKey *key = data;
+	const JabberCapsTuple *key = data;
 	guint nodehash = g_str_hash(key->node);
 	guint verhash  = g_str_hash(key->ver);
 	/*
 	 * 'hash' was optional in XEP-0115 v1.4 and g_str_hash crashes on NULL >:O.
 	 * Okay, maybe I've played too much Zelda, but that looks like
 	guint hashhash = (key->hash ? g_str_hash(key->hash) : 0);
 	return nodehash ^ verhash ^ hashhash;
 }
 static gboolean jabber_caps_compare(gconstpointer v1, gconstpointer v2) {
-	const JabberCapsKey *name1 = v1;
+	const JabberCapsTuple *name1 = v1;
-	const JabberCapsKey *name2 = v2;
+	const JabberCapsTuple *name2 = v2;
 	return g_str_equal(name1->node, name2->node) &&
 	       g_str_equal(name1->ver, name2->ver) &&
 	       purple_strequal(name1->hash, name2->hash);
-}
-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);
 }
 static void
 jabber_caps_client_info_destroy(JabberCapsClientInfo *info)
 {
 		info->forms = g_list_delete_link(info->forms, info->forms);
 	}
 	jabber_caps_node_exts_unref(info->exts);
+	g_free((char *)info->tuple.node);
+	g_free((char *)info->tuple.ver);
+	g_free((char *)info->tuple.hash);
 	g_free(info);
 }
 /* NOTE: Takes a reference to the exts, unref it if you don't really want to
 * keep it around. */
 		xmlnode_set_attrib(feature, "var", (const gchar *)node->data);
 	}
 }
 static void jabber_caps_store_client(gpointer key, gpointer value, gpointer user_data) {
-	JabberCapsKey *clientinfo = key;
+	const JabberCapsTuple *tuple = key;
-	JabberCapsClientInfo *props = value;
+	const JabberCapsClientInfo *props = value;
 	xmlnode *root = user_data;
 	xmlnode *client = xmlnode_new_child(root, "client");
 	GList *iter;
-	xmlnode_set_attrib(client, "node", clientinfo->node);
+	xmlnode_set_attrib(client, "node", tuple->node);
-	xmlnode_set_attrib(client, "ver", clientinfo->ver);
+	xmlnode_set_attrib(client, "ver", tuple->ver);
-	if (clientinfo->hash)
+	if (tuple->hash)
-		xmlnode_set_attrib(client, "hash", clientinfo->hash);
+		xmlnode_set_attrib(client, "hash", tuple->hash);
 	for(iter = props->identities; iter; iter = g_list_next(iter)) {
 		JabberIdentity *id = iter->data;
 		xmlnode *identity = xmlnode_new_child(client, "identity");
 		xmlnode_set_attrib(identity, "category", id->category);
 		xmlnode_set_attrib(identity, "type", id->type);
 	for(client = capsdata->child; client; client = client->next) {
 		if(client->type != XMLNODE_TYPE_TAG)
 			continue;
 		if(!strcmp(client->name, "client")) {
-			JabberCapsKey *key = g_new0(JabberCapsKey, 1);
 			JabberCapsClientInfo *value = g_new0(JabberCapsClientInfo, 1);
+			JabberCapsTuple *key = (JabberCapsTuple*)&value->tuple;
 			xmlnode *child;
 			JabberCapsNodeExts *exts = NULL;
 			key->node = g_strdup(xmlnode_get_attrib(client,"node"));
 			key->ver  = g_strdup(xmlnode_get_attrib(client,"ver"));
 			key->hash = g_strdup(xmlnode_get_attrib(client,"hash"));
 }
 void jabber_caps_init(void)
 {
 	nodetable = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)jabber_caps_node_exts_unref);
-	capstable = g_hash_table_new_full(jabber_caps_hash, jabber_caps_compare, jabber_caps_destroy_key, (GDestroyNotify)jabber_caps_client_info_destroy);
+	capstable = g_hash_table_new_full(jabber_caps_hash, jabber_caps_compare, NULL, (GDestroyNotify)jabber_caps_client_info_destroy);
 	jabber_caps_load();
 }
 void jabber_caps_uninit(void)
 {
 {
 	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
 		"http://jabber.org/protocol/disco#info");
 	jabber_caps_cbplususerdata *userdata = data;
 	JabberCapsClientInfo *info = NULL, *value;
-	JabberCapsKey key;
+	JabberCapsTuple key;
 	if (!query || type == JABBER_IQ_ERROR) {
 		/* Any outstanding exts will be dealt with via ref-counting */
 		userdata->cb(NULL, NULL, userdata->cb_data);
 		cbplususerdata_unref(userdata);
 	 * a new one if we need to */
 	if ((value = g_hash_table_lookup(capstable, &key))) {
 		jabber_caps_client_info_destroy(info);
 		info = value;
 	} else {
-		JabberCapsKey *n_key = g_new(JabberCapsKey, 1);
+		JabberCapsTuple *n_key = (JabberCapsTuple *)&info->tuple;
 		n_key->node = userdata->node;
 		n_key->ver  = userdata->ver;
 		n_key->hash = userdata->hash;
 		userdata->node = userdata->ver = userdata->hash = NULL;
 void jabber_caps_get_info(JabberStream *js, const char *who, const char *node,
 const char *ver, const char *hash, const char *ext,
 jabber_caps_get_info_cb cb, gpointer user_data)
 {
 	JabberCapsClientInfo *info;
-	JabberCapsKey key;
+	JabberCapsTuple key;
 	jabber_caps_cbplususerdata *userdata;
 	if (ext && *ext && hash)
 		purple_debug_info("jabber", "Ignoring exts in new-style caps from %s\n",
 		                     who);

Mercurial > pidgin3 / file comparison

comparison: libpurple/protocols/jabber/caps.c

libpurple/protocols/jabber/caps.c