Changes in / [5bc0f68:89f5338]

Files:

• aim.c (modified) (10 diffs)
• cmd.c (modified) (1 diff)
• configure.in (modified) (2 diffs)
• functions.c (modified) (3 diffs)
• global.c (modified) (1 diff)
• message.c (modified) (3 diffs)
• owl.c (modified) (2 diffs)
• owl.h (modified) (1 diff)
• text.c (modified) (1 diff)
• util.c (modified) (1 diff)
• zcrypt.c (modified) (6 diffs)
• zwrite.c (modified) (3 diffs)

aim.c

@@ -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")) {

cmd.c

@@ -74 +74 @@
   owl_cmd *cmd;
 
-  tmpbuff=owl_strdup(cmdbuff);
+  tmpbuff=strdup(cmdbuff);
   argv=owl_parseline(tmpbuff, &argc);
   if (argc < 0) {

configure.in

@@ -12 +12 @@
 fi
 
-dnl m4_include(/usr/share/aclocal/pkg.m4)
-m4_include(pkg.m4)
 
 dnl Check for Athena
@@ -111 +109 @@
 LDFLAGS=${LDFLAGS}\ ${FOO}
 
-dnl Add CFLAGS and LDFLAGS for glib-2.0
-PKG_CHECK_MODULES(GLIB,glib-2.0)
-
-echo Adding glib-2.0 CFLAGS ${GLIB_CFLAGS}
-CFLAGS=${CFLAGS}\ ${GLIB_CFLAGS}
-echo Adding glib-2.0 LDFLAGS ${GLIB_LIBS}
-LDFLAGS=${LDFLAGS}\ ${GLIB_LIBS}
-
-
 dnl Checks for typedefs, structures, and compiler characteristics.
 

functions.c

@@ -3023 +3023 @@
   char *quoted;
 
-  buff=owl_malloc(strlen(class)+strlen(inst)+strlen(recip)+100);
+  buff=malloc(strlen(class)+strlen(inst)+strlen(recip)+100);
   strcpy(buff, "class");
   if (!strcmp(class, "*")) {
@@ -3327 +3327 @@
           if (ret==0) {
             for (x=0; x<numlocs; x++) {
-              line=owl_malloc(strlen(location[x].host)+strlen(location[x].time)+strlen(location[x].tty)+100);
+              line=malloc(strlen(location[x].host)+strlen(location[x].time)+strlen(location[x].tty)+100);
               tmp=short_zuser(user);
               sprintf(line, "  %-10.10s %-24.24s %-12.12s  %20.20s\n",
@@ -3433 +3433 @@
           _exit(127);
         }
-        parsed=owl_realloc(parsed, sizeof(*parsed) * (myargc+1));
+        parsed=realloc(parsed, sizeof(*parsed) * (myargc+1));
         parsed[myargc] = NULL;
         

global.c

@@ -545 +545 @@
     len+=strlen(argv[i])+5;
   }
-  g->startupargs=owl_malloc(len+5);
+  g->startupargs=malloc(len+5);
 
   strcpy(g->startupargs, "");

message.c

@@ -493 +493 @@
 {
   if(m->zwriteline) owl_free(m->zwriteline);
-  m->zwriteline=owl_strdup(line);
+  m->zwriteline=strdup(line);
 }
 
@@ -890 +890 @@
   }
 
-  m->zwriteline=owl_strdup("");
+  m->zwriteline=strdup("");
 
   /* save the hostname */
@@ -972 +972 @@
   }
 
-  m->zwriteline=owl_strdup("");
+  m->zwriteline=strdup("");
 
   owl_message_set_body(m, "<uninitialized>");

owl.c

@@ -48 +48 @@
 #include <termios.h>
 #include <sys/stat.h>
-#include <locale.h>
 #include "owl.h"
 
@@ -93 +92 @@
   debug=0;
   initialsubs=1;
-
-  setlocale(LC_ALL, "");
-  
   if (argc>0) {
     argv++;

owl.h

@@ -53 +53 @@
 #include <libfaim/aim.h>
 #include "config.h"
-#include "glib.h"
 #ifdef HAVE_LIBZEPHYR
 #include <zephyr/zephyr.h>

text.c

@@ -327 +327 @@
   tolen  = strlen(to);
   fromlen  = strlen(from);
-  out = owl_malloc(outlen);
+  out = malloc(outlen);
 
   while (in[inpos]) {

util.c

@@ -446 +446 @@
 void *owl_malloc(size_t size)
 {
-  return(g_malloc(size));
+  return(malloc(size));
 }
 
 void owl_free(void *ptr)
 {
-  g_free(ptr);
+  free(ptr);
 }
 
 char *owl_strdup(const char *s1)
 {
-  return(g_strdup(s1));
+  return(strdup(s1));
 }
 
 void *owl_realloc(void *ptr, size_t size)
 {
-  return(g_realloc(ptr, size));
+  return(realloc(ptr, size));
 }
 

zcrypt.c

@@ -385 +385 @@
 
 /* Build a space-separated string from argv from elements between start  *
- * and end - 1.  owl_malloc()'s the returned string. */
+ * and end - 1.  malloc()'s the returned string. */
 char *BuildArgString(char **argv, int start, int end) {
   int len = 1;
@@ -397 +397 @@
 
   /* Allocate memory */
-  result = (char *)owl_malloc(len);
+  result = (char *)malloc(len);
   if (result) {
     /* Build the string */
@@ -482 +482 @@
       /* Prepare result to be returned */
       char *temp = keyfile;
-      keyfile = (char *)owl_malloc(strlen(temp) + 1);
+      keyfile = (char *)malloc(strlen(temp) + 1);
       if (keyfile) {
         strcpy(keyfile, temp);
@@ -611 +611 @@
       }
       use_buffer = TRUE;
-      if ((inptr = inbuff = (char *)owl_malloc(MAX_RESULT)) == NULL) {
+      if ((inptr = inbuff = (char *)malloc(MAX_RESULT)) == NULL) {
         printf("Memory allocation error\n");
         return FALSE;
@@ -639 +639 @@
       printf("Could not run zwrite\n");
       if (freein && inbuff) {
-        owl_free(inbuff);
+        free(inbuff);
       }
       return(FALSE);
@@ -685 +685 @@
 
   /* Free the input buffer, if necessary */
-  if (freein && inbuff) owl_free(inbuff);
+  if (freein && inbuff) free(inbuff);
 
   return(!error);

zwrite.c

@@ -95 +95 @@
       z->message=owl_strdup("");
       while (myargc) {
-        z->message=owl_realloc(z->message, strlen(z->message)+strlen(myargv[0])+5);
+        z->message=realloc(z->message, strlen(z->message)+strlen(myargv[0])+5);
         strcat(z->message, myargv[0]);
         strcat(z->message, " ");
@@ -113 +113 @@
     } else {
       /* anything unattached is a recipient */
-      owl_list_append_element(&(z->recips), owl_strdup(myargv[0]));
+      owl_list_append_element(&(z->recips), strdup(myargv[0]));
       myargv++;
       myargc--;
@@ -177 +177 @@
       z->zsig=owl_strdup(zsigzvar);
     } else if (((pw=getpwuid(getuid()))!=NULL) && (pw->pw_gecos)) {
-      z->zsig=owl_strdup(pw->pw_gecos);
+      z->zsig=strdup(pw->pw_gecos);
       ptr=strchr(z->zsig, ',');
       if (ptr) {