[ekg2-commit] ekg2: jabber_handlers.c (HEAD) jabber_handlers_iq_result.c (HEAD) [darkjames]

[CVS commit]

Module name:	ekg2
Changes by:	darkjames	2007-12-26 13:06:41

Modified files:
	jabber_handlers.c jabber_handlers_iq_result.c

Log message:
cleanup.

Index: jabber_handlers.c
===================================================================
RCS file: /home/cvs/ekg2/plugins/jabber/jabber_handlers.c,v
diff -d -u -r1.138 -r1.139
--- jabber_handlers.c	26 Dec 2007 11:59:52 -0000	1.138
+++ jabber_handlers.c	26 Dec 2007 12:06:41 -0000	1.139
@@ -1358,22 +1358,31 @@
 	const char *id   = jabber_attr(n->atts, "id");
 	const char *from = jabber_attr(n->atts, "from");
 
-	xmlnode_t *q;
-
 	jabber_iq_type_t type = JABBER_IQ_TYPE_NONE;
 
+	struct jabber_iq_generic_handler *callbacks;
+	xmlnode_t *q;
+
 	if (!xstrcmp(atype, "get"))		type = JABBER_IQ_TYPE_GET;
 	else if (!xstrcmp(atype, "set"))	type = JABBER_IQ_TYPE_SET;
 	else if (!xstrcmp(atype, "result"))	type = JABBER_IQ_TYPE_RESULT;
 	else if (!xstrcmp(atype, "error"))	type = JABBER_IQ_TYPE_ERROR;
-
-	else if (atype)				debug_error("[jabber] <iq> wtf iq type: %s\n", atype);
-	else {					debug_error("[jabber] <iq> without type!\n");
-						return;
+	else if (!atype) {
+		debug_error("[jabber] <iq> without type!\n");
+		return;
 	}
 
-	if (type == JABBER_IQ_TYPE_ERROR) {
-		jabber_handler_iq_generic_error(s, n, from, id); return;
+	switch (type) {
+		case JABBER_IQ_TYPE_RESULT:		callbacks = jabber_iq_result_handlers;	break;
+		case JABBER_IQ_TYPE_SET:		callbacks = jabber_iq_set_handlers;	break;
+		case JABBER_IQ_TYPE_GET:		callbacks = jabber_iq_get_handlers;	break;
+
+		case JABBER_IQ_TYPE_ERROR:
+			jabber_handler_iq_generic_error(s, n, from, id);
+			return;
+		case JABBER_IQ_TYPE_NONE:
+			debug_error("[jabber] <iq> wtf iq type: %s\n", atype);
+			return;
 	}
 
 	if (!xstrcmp(id, "auth")) {
@@ -1400,21 +1409,8 @@
 		return;
 	}
 
-
 	for (q = n->children; q; q = q->next) {
-		struct jabber_iq_generic_handler *tmp;
-
-		switch (type) {
-			case JABBER_IQ_TYPE_RESULT:	tmp = jabber_iq_result_handlers;	break;
-			case JABBER_IQ_TYPE_SET:	tmp = jabber_iq_set_handlers;		break;
-			case JABBER_IQ_TYPE_GET:	tmp = jabber_iq_get_handlers;		break;
-			default:
-							debug_error("[%s:%d] Internal error\n", __FILE__, __LINE__);
-							tmp = NULL;
-		}
-
-		if (!tmp)
-			return;
+		struct jabber_iq_generic_handler *tmp = callbacks;
 
 		while (tmp->handler) {
 			const char *ns = jabber_attr(q->atts, "xmlns");
@@ -1433,7 +1429,7 @@
 						 * ...
 						 * ...
 						 */
-						goto iq_type_reset_next;
+						goto iq_child_next;
 					}
 
 					tmp++;
@@ -1446,7 +1442,7 @@
 			}
 			debug_error("[jabber] <iq %s> unknown name: <%s xmlns=%s\n", atype, __(q->name), __(ns));
 		}
-iq_type_reset_next:
+iq_child_next:
 		continue;
 	}
 } /* iq */

Index: jabber_handlers_iq_result.c
===================================================================
RCS file: /home/cvs/ekg2/plugins/jabber/jabber_handlers_iq_result.c,v
diff -d -u -r1.3 -r1.4
--- jabber_handlers_iq_result.c	26 Dec 2007 11:59:52 -0000	1.3
+++ jabber_handlers_iq_result.c	26 Dec 2007 12:06:41 -0000	1.4
@@ -148,6 +148,7 @@
 
 /* XXX, check if this is really result. */
 JABBER_HANDLER_RESULT(jabber_handle_iq_result_privacy) {
+#if 0
 	jabber_private_t *j = s->priv;
 
 	xmlnode_t *active 	= xmlnode_find_child(n, "active");
@@ -254,6 +255,7 @@
 	}
 	if (i > 0)  print("jabber_privacy_list_end", session_name(s), j->server);
 	if (i == 0) print("jabber_privacy_list_noitem", session_name(s), j->server);
+#endif
 }
 
 /* XXX, check if this is really result. */