- Wed Nov 8 02:23:25 UTC 2000

[libfaim.git] / aim_search.c

diff --git a/aim_search.c b/aim_search.c
index 78aef0fc7c55da9edebac0498e1564f32c0283d0..1963592a7e911c779b7cc6fa7e30425bcd05612b 100644 (file)
--- a/aim_search.c
+++ b/aim_search.c
@@ -8,32 +8,25 @@
 
 #include <faim/aim.h>
 
-u_long aim_usersearch_address(struct aim_session_t *sess,
-                             struct aim_conn_t *conn, 
-                             char *address)
+faim_export unsigned long aim_usersearch_address(struct aim_session_t *sess,
+                                                struct aim_conn_t *conn, 
+                                                char *address)
 {
-  struct command_tx_struct newpacket;
+  struct command_tx_struct *newpacket;
   
   if (!address)
     return -1;
 
-  newpacket.lock = 1;
-
-  if (conn)
-    newpacket.conn = conn;
-  else
-    newpacket.conn = aim_getconn_type(sess, AIM_CONN_TYPE_BOS);
+  if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 10+strlen(address))))
+    return -1;
 
-  newpacket.type = 0x0002;
-  
-  newpacket.commandlen = 10 + strlen(address);
-  newpacket.data = (char *) malloc(newpacket.commandlen);
+  newpacket->lock = 1;
 
-  aim_putsnac(newpacket.data, 0x000a, 0x0002, 0x0000, sess->snac_nextid);
+  aim_putsnac(newpacket->data, 0x000a, 0x0002, 0x0000, sess->snac_nextid);
 
-  memcpy(&(newpacket.data[10]), address, strlen(address));
+  aimutil_putstr(newpacket->data+10, address, strlen(address));
 
-  aim_tx_enqueue(sess, &newpacket);
+  aim_tx_enqueue(sess, newpacket);
 
   {
     struct aim_snac_t snac;