Changeset 7975229

Timestamp:

Nov 17, 2013, 3:44:13 AM (10 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

release-1.9

Children:

1cefe5f

Parents:

017bf98

git-author:

Jason Gross <jgross@mit.edu> (01/12/13 15:42:56)

git-committer:

Anders Kaseorg <andersk@mit.edu> (11/17/13 03:44:13)

Message:

Die on a failed zephyr_zwrite; don't silently ignore it

(cherry picked from commit 374089acfb4f43fdb00e90ec924887d88fd84f5d)

Files:

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

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)
@@ -475 +466 @@
         }
 
+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