- Mon Sep 4 22:08:35 GMT 2000

   - Forgot aim_snac and aim_search

diff --git a/CHANGES b/CHANGES
index ecdf5c1539352b04a9fa56bb5be15ce39450d305..07efd4b883efc31da5792f1bcb02618fd84907b4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 
 No release numbers
 ------------------
+ - Mon Sep  4 22:08:35 GMT 2000
+   - Forgot aim_snac and aim_search
+
  - Mon Sep  4 21:38:09 GMT 2000
    - A mild step towards ANSI compliance
      - Compiles cleanly with -pedantic (except for the libc issue in socket.h)

diff --git a/aim_search.c b/aim_search.c
index d67d772af723d90419d82310716dd17b2eb6bf96..1963592a7e911c779b7cc6fa7e30425bcd05612b 100644 (file)
--- a/aim_search.c
+++ b/aim_search.c
@@ -8,9 +8,9 @@
 
 #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;
   

diff --git a/aim_snac.c b/aim_snac.c
index dd878499403d9bf35399c93b4e222ff3b2181f97..c6b005b9c47ee46fad0751859dac2a2228633744 100644 (file)
--- a/aim_snac.c
+++ b/aim_snac.c
@@ -18,7 +18,7 @@
 /*
  * Called from aim_session_init() to initialize the hash.
  */
-void aim_initsnachash(struct aim_session_t *sess)
+faim_internal void aim_initsnachash(struct aim_session_t *sess)
 {
   int i;
 
@@ -34,8 +34,8 @@ void aim_initsnachash(struct aim_session_t *sess)
  * Clones the passed snac structure and caches it in the
  * list/hash.
  */
-u_long aim_newsnac(struct aim_session_t *sess,
-                  struct aim_snac_t *newsnac) 
+faim_internal unsigned long aim_newsnac(struct aim_session_t *sess,
+                                       struct aim_snac_t *newsnac) 
 {
   struct aim_snac_t *snac = NULL;
   int index;
@@ -56,8 +56,6 @@ u_long aim_newsnac(struct aim_session_t *sess,
   sess->snac_hash[index] = snac;
   faim_mutex_unlock(&sess->snac_hash_locks[index]);
 
-  printf("faim: cached snac %lx\n", snac->id);
-
   return(snac->id);
 }
 
@@ -68,8 +66,8 @@ u_long aim_newsnac(struct aim_session_t *sess,
  * The returned structure must be freed by the caller.
  *
  */
-struct aim_snac_t *aim_remsnac(struct aim_session_t *sess, 
-                              u_long id) 
+faim_internal struct aim_snac_t *aim_remsnac(struct aim_session_t *sess, 
+                                            u_long id) 
 {
   struct aim_snac_t *cur = NULL;
   int index;
@@ -108,8 +106,8 @@ struct aim_snac_t *aim_remsnac(struct aim_session_t *sess,
  * maxage is the _minimum_ age in seconds to keep SNACs.
  *
  */
-int aim_cleansnacs(struct aim_session_t *sess,
-                  int maxage)
+faim_internal int aim_cleansnacs(struct aim_session_t *sess,
+                                int maxage)
 {
   struct aim_snac_t *cur, *next, *prev = NULL;
   time_t curtime;
@@ -133,8 +131,6 @@ int aim_cleansnacs(struct aim_session_t *sess,
        else
          prev->next = next;
 
-       printf("faim: killing ancient snac %lx (%lx)\n", cur->id, curtime - cur->issuetime);
-       
        /* XXX should we have destructors here? */
        if (cur->data)
          free(cur->data);
@@ -152,7 +148,7 @@ int aim_cleansnacs(struct aim_session_t *sess,
   return 0;
 }
 
-int aim_putsnac(u_char *buf, int family, int subtype, int flags, u_long snacid)
+faim_internal int aim_putsnac(u_char *buf, int family, int subtype, int flags, u_long snacid)
 {
   int curbyte = 0;
   curbyte += aimutil_put16(buf+curbyte, (u_short)(family&0xffff));

diff --git a/faim/aim.h b/faim/aim.h
index d17eeac08948af8b9549e80d2ccc5e284b4564f8..98bd142a8d0cfacade170dd402ccb72e5d6bb087 100644 (file)
--- a/faim/aim.h
+++ b/faim/aim.h
@@ -468,11 +468,11 @@ struct aim_snac_t {
   time_t issuetime;
   struct aim_snac_t *next;
 };
-void aim_initsnachash(struct aim_session_t *sess);
-u_long aim_newsnac(struct aim_session_t *, struct aim_snac_t *newsnac);
-struct aim_snac_t *aim_remsnac(struct aim_session_t *, u_long id);
-int aim_cleansnacs(struct aim_session_t *, int maxage);
-int aim_putsnac(u_char *, int, int, int, u_long);
+faim_internal void aim_initsnachash(struct aim_session_t *sess);
+faim_internal unsigned long aim_newsnac(struct aim_session_t *, struct aim_snac_t *newsnac);
+faim_internal struct aim_snac_t *aim_remsnac(struct aim_session_t *, u_long id);
+faim_internal int aim_cleansnacs(struct aim_session_t *, int maxage);
+faim_internal int aim_putsnac(u_char *, int, int, int, u_long);
 
 
 faim_internal void aim_connrst(struct aim_session_t *);
@@ -677,8 +677,7 @@ faim_export unsigned long aim_remove_buddy(struct aim_session_t *, struct aim_co
 faim_internal int aim_parse_buddyrights(struct aim_session_t *sess, struct command_rx_struct *command, ...);
 
 /* aim_search.c */
-u_long aim_usersearch_address(struct aim_session_t *, struct aim_conn_t *, char *);
-/* u_long aim_usersearch_name(struct aim_session_t *, struct aim_conn_t *, char *); */
+faim_export u_long aim_usersearch_address(struct aim_session_t *, struct aim_conn_t *, char *);
 
 
 struct aim_chat_roominfo {