- Mon May 7 15:19:55 PDT 2001

[libfaim.git] / src / search.c

diff --git a/src/search.c b/src/search.c
index a1024125b1b25dcdf1c3fca9d78f3641046f7333..0a5966273f9993a2c09f65d42af424655f599f4a 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -34,11 +34,11 @@ faim_export unsigned long aim_usersearch_address(struct aim_session_t *sess,
   return sess->snac_nextid;
 }
 
-
+/* XXX can this be integrated with the rest of the error handling? */
 static int error(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
   int ret = 0;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   struct aim_snac_t *snac2;
 
   /* XXX the modules interface should have already retrieved this for us */
@@ -65,7 +65,7 @@ static int reply(struct aim_session_t *sess, aim_module_t *mod, struct command_r
   unsigned int j, m, ret = 0;
   struct aim_tlvlist_t *tlvlist;
   char *cur = NULL, *buf = NULL;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   struct aim_snac_t *snac2;
 
   if (!(snac2 = aim_remsnac(sess, snac->id))) {
@@ -111,11 +111,6 @@ static int reply(struct aim_session_t *sess, aim_module_t *mod, struct command_r
 static int snachandler(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
 
-  faimdprintf(sess, 0, "%s: snachandler: got %x/%x\n", mod->name, snac->family, snac->subtype);
-
-  if (snac->family != mod->family)
-    return 0;
-
   if (snac->subtype == 0x0001)
     return error(sess, mod, rx, snac, data, datalen);
   else if (snac->subtype == 0x0003)