Changes in / [de3b1d3:8258ea5]

Files:

• filter.c (modified) (1 diff)
• perl/lib/BarnOwl.pm (modified) (1 diff)
• perlglue.xs (modified) (2 diffs)
• zcrypt.c (modified) (1 diff)

filter.c

@@ -124 +124 @@
 
   op1 = owl_filter_parse_primitive_expression(argc-i, argv+i, &skip);
+  i += skip;
   if(!op1) goto err;
-  i += skip;
 
   while(i < argc) {

perl/lib/BarnOwl.pm

@@ -93 +93 @@
 command line, and C<MESSAGE> is the zephyr body to send.
 
-=cut
-
-sub zephyr_zwrite {
-    my ($command, $message) = @_;
-    my $ret = BarnOwl::Internal::zephyr_zwrite($command, $message);
-    die "Error sending zephyr" unless $ret == 0;
-}
-
 =head2 ztext_stylestrip STRING
 

perlglue.xs

@@ -96 +96 @@
                 RETVAL
 
+void
+zephyr_zwrite(cmd,msg)
+        const char *cmd
+        const char *msg
+        PREINIT:
+                int i;
+        CODE:
+                i = owl_zwrite_create_and_send_from_line(cmd, msg);
+
 const utf8 *
 ztext_stylestrip(ztext)
@@ -466 +475 @@
         }
 
-int
-zephyr_zwrite(cmd,msg)
-        const char *cmd
-        const char *msg
-        CODE:
-                RETVAL = owl_zwrite_create_and_send_from_line(cmd, msg);
-        OUTPUT:
-                RETVAL
-
 MODULE = BarnOwl                PACKAGE = BarnOwl::Editwin
 

zcrypt.c

@@ -866 +866 @@
 
   err = call_filter(argv, in, &out, &status);
-  free(in);
   if(err || status) {
     g_free(out);