Changes in aim.c [554a2b8:e3e6cff]

File:

• aim.c (modified) (16 diffs)

aim.c

@@ -239 +239 @@
 {
   if (message) {
-    owl_function_error("%s", message);
+    owl_function_error(message);
   } else {
     owl_function_error("Authentication error on login");
@@ -252 +252 @@
   int ret;
 
-  ret=aim_im_sendch1(owl_global_get_aimsess(&g), to, 0, msg);
+  ret=aim_im_sendch1(owl_global_get_aimsess(&g), to, NULL, msg);
     
   /* I don't know how to check for an error yet */
@@ -948 +948 @@
   
   if (modname) {
-    if (!(filename = owl_malloc(strlen(priv->aimbinarypath)+1+strlen(modname)+4+1))) {
+    if (!(filename = malloc(strlen(priv->aimbinarypath)+1+strlen(modname)+4+1))) {
       /* perror("memrequest: malloc"); */
       return -1;
@@ -954 +954 @@
     sprintf(filename, "%s/%s.ocm", priv->aimbinarypath, modname);
   } else {
-    if (!(filename = owl_malloc(strlen(priv->aimbinarypath)+1+strlen(defaultmod)+1))) {
+    if (!(filename = malloc(strlen(priv->aimbinarypath)+1+strlen(defaultmod)+1))) {
       /* perror("memrequest: malloc"); */
       return -1;
@@ -964 +964 @@
     if (!modname) {
       /* perror("memrequest: stat"); */
-      owl_free(filename);
+      free(filename);
       return -1;
     }
@@ -986 +986 @@
     int i;
     
-    owl_free(filename); /* not needed */
+    free(filename); /* not needed */
     owl_function_error("getaimdata memrequest: recieved invalid request for 0x%08lx bytes at 0x%08lx (file %s)\n", len, offset, modname);
     i = 8;
@@ -993 +993 @@
     }
     
-    if (!(buf = owl_malloc(i))) {
+    if (!(buf = malloc(i))) {
       return -1;
     }
@@ -1017 +1017 @@
     *buflenret = i;
   } else {
-    if (!(buf = owl_malloc(len))) {
-      owl_free(filename);
+    if (!(buf = malloc(len))) {
+      free(filename);
       return -1;
     }
@@ -1024 +1024 @@
     if (!(f = fopen(filename, "r"))) {
       /* perror("memrequest: fopen"); */
-      owl_free(filename);
-      owl_free(buf);
+      free(filename);
+      free(buf);
       return -1;
     }
     
-    owl_free(filename);
+    free(filename);
     
     if (fseek(f, offset, SEEK_SET) == -1) {
       /* perror("memrequest: fseek"); */
       fclose(f);
-      owl_free(buf);
+      free(buf);
       return -1;
     }
@@ -1041 +1041 @@
       /* perror("memrequest: fread"); */
       fclose(f);
-      owl_free(buf);
+      free(buf);
       return -1;
     }
@@ -1076 +1076 @@
   if (priv->aimbinarypath && (getaimdata(sess, &buf, &buflen, offset, len, modname) == 0)) {
     aim_sendmemblock(sess, fr->conn, offset, buflen, buf, AIM_SENDMEMBLOCK_FLAG_ISREQUEST);
-    owl_free(buf);
+    free(buf);
   } else {
     owl_function_debugmsg("faimtest_memrequest: unable to use AIM binary (\"%s/%s\"), sending defaults...\n", priv->aimbinarypath, modname);
@@ -1342 +1342 @@
       int z;
       
-      newbuf = owl_malloc(i+1);
+      newbuf = malloc(i+1);
       for (z = 0; z < i; z++)
         newbuf[z] = (z % 10)+0x30;
       newbuf[i] = '\0';
       /* aim_send_im(sess, userinfo->sn, AIM_IMFLAGS_ACK | AIM_IMFLAGS_AWAY, newbuf); */
-      owl_free(newbuf);
+      free(newbuf);
     }
   } else if (strstr(tmpstr, "seticqstatus")) {
@@ -1698 +1698 @@
   
   /* printf("snac threw error (reason 0x%04x: %s)\n", reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
-  if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
+  if (reason<msgerrreasonslen) owl_function_error(msgerrreasons[reason]);
   
   return 1;
@@ -1715 +1715 @@
   
   /* printf("message to %s bounced (reason 0x%04x: %s)\n", destsn, reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
-  if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
+  if (reason<msgerrreasonslen) owl_function_error(msgerrreasons[reason]);
 
   if (reason==4) {
@@ -1736 +1736 @@
   
   /* printf("user information for %s unavailable (reason 0x%04x: %s)\n", destsn, reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
-  if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
+  if (reason<msgerrreasonslen) owl_function_error(msgerrreasons[reason]);
   
   return 1;
@@ -2309 +2309 @@
   aim_sendcookie(sess, tstconn, redir->cookielen, redir->cookie);
   return;       
-}
-
-void owl_process_aim()
-{
-  if (owl_global_is_doaimevents(&g)) {
-    owl_aim_process_events();
-
-    if (owl_global_is_aimloggedin(&g)) {
-      if (owl_timer_is_expired(owl_global_get_aim_buddyinfo_timer(&g))) {
-        /* owl_buddylist_request_idletimes(owl_global_get_buddylist(&g)); */
-        owl_timer_reset(owl_global_get_aim_buddyinfo_timer(&g));
-      }
-    }
-  }
 }