Changeset 2fa15f0

Timestamp:

Oct 30, 2006, 1:51:58 AM (18 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

f72f573

Parents:

f8b42ac

Message:

1) Fix massive memory leak. I've removed the variable that held the
mainloop hook name, replacing the two references to it with the
hard-coded function "owl::mainloop_hook". We were discussing doing
this anyhow, and since leak was in getting the variable over and over
again, this was the easiest way to deal.

2) Updated owlconf.pl in light of (1). Update your local copy!

3) jabber - groupchat history is not requested, and is explicitly
ignored.

Files:

• owl.c (modified) (3 diffs)
• variable.c (modified) (1 diff)

owl.c

@@ -72 +72 @@
   int newmsgs, zpendcount, nexttimediff;
   struct sigaction sigact;
-  char *configfile, *tty, *perlout, *perlerr, **argvsave, buff[LINE], startupmsg[LINE], *perl_mainloop_hook;
+  char *configfile, *tty, *perlout, *perlerr, **argvsave, buff[LINE], startupmsg[LINE];
   owl_filter *f;
   owl_style *s;
@@ -92 +92 @@
   debug=0;
   initialsubs=1;
-  perl_mainloop_hook = NULL;
   if (argc>0) {
     argv++;
@@ -448 +447 @@
 
     /* Hook perl into the loop */
-    perl_mainloop_hook = owl_global_get_perl_mainloop_hook(&g);
-    if (perl_mainloop_hook) {
-      if (owl_perlconfig_is_function(perl_mainloop_hook)) {
-        owl_function_debugmsg("startup: executing perl mainloop hook");
-        perlout = owl_perlconfig_execute(perl_mainloop_hook);
-        if (perlout) owl_free(perlout);
-      }
+
+    if (owl_perlconfig_is_function("owl::mainloop_hook")) {
+         perlout = owl_perlconfig_execute("owl::mainloop_hook");
+         if (perlout) owl_free(perlout);
     }
 

variable.c

@@ -356 +356 @@
                "delete a message right as it came in.\n" ),
 
-  OWLVAR_STRING( "perl_mainloop_hook" /* %OwlVarStub */, NULL,
-                 "mainloop hook to perl",
-                 "If this variable is set, owl will call to the perl function\n"
-                 "specified." ),
-  
   /* This MUST be last... */
   { NULL, 0, NULL, 0, NULL, NULL, NULL, NULL,