Changeset 7eaa83b

Timestamp:

Jan 23, 2012, 3:40:20 PM (12 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

678f607 (diff), 4af1241 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 4af1241129bea4735ebbe86985915b652490f412 into 678f607a39f5773acac88c24b83bde78981ae8b5

Files:

• functions.c (modified) (1 diff)
• owl.c (modified) (2 diffs)
• zwrite.c (modified) (5 diffs)

functions.c

@@ -434 +434 @@
   }
 
-  /* free the zwrite */
+  /* Clean up. */
   g_free(cryptmsg);
+  g_free(old_msg);
 }
 

owl.c

@@ -585 +585 @@
   );
 
+  owl_function_debugmsg("startup: setting context interactive");
+
+  owl_global_pop_context(&g);
+  owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
+
   /* process the startup file */
   owl_function_debugmsg("startup: processing startup file");
@@ -596 +601 @@
       owl_function_error("No such style: %s", owl_global_get_default_style(&g));
 
-  owl_function_debugmsg("startup: setting context interactive");
-
-  owl_global_pop_context(&g);
-  owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
-
   source = owl_window_redraw_source_new();
   g_source_attach(source, NULL);

zwrite.c

@@ -4 +4 @@
 {
   owl_zwrite *z = g_new(owl_zwrite, 1);
-  if (owl_zwrite_create_from_line(z, line) < 0) {
-    owl_zwrite_delete(z);
+  if (owl_zwrite_create_from_line(z, line) != 0) {
+    g_free(z);
     return NULL;
   }
@@ -14 +14 @@
 {
   owl_zwrite *z = g_new(owl_zwrite, 1);
-  if (owl_zwrite_create(z, argc, argv) < 0) {
-    owl_zwrite_delete(z);
+  if (owl_zwrite_create(z, argc, argv) != 0) {
+    g_free(z);
     return NULL;
   }
@@ -135 +135 @@
 
   if (badargs) {
+    owl_zwrite_cleanup(z);
     return(-1);
   }
@@ -142 +143 @@
       z->recips->len == 0) {
     owl_function_error("You must specify a recipient for zwrite");
+    owl_zwrite_cleanup(z);
     return(-1);
   }
@@ -267 +269 @@
   owl_zwrite z;
   int rv;
-  rv=owl_zwrite_create_from_line(&z, cmd);
-  if (rv) return(rv);
+  rv = owl_zwrite_create_from_line(&z, cmd);
+  if (rv != 0) return rv;
   if (!owl_zwrite_is_message_set(&z)) {
     owl_zwrite_set_message(&z, msg);