Changeset 3f3ee61

Timestamp:

Oct 29, 2008, 9:38:18 PM (16 years ago)

Author:

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

Branches:

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

Children:

7e78e49

Parents:

e979da9

Message:

Factor the code used to populate zsigs out of the function used to
parse zwrite lines, and call it only when we're sending a message.
Now users with a zsigproc will only have it called once when sending a
zephyr.

Files:

• functions.c (modified) (2 diffs)
• zwrite.c (modified) (5 diffs)

functions.c

@@ -378 +378 @@
   /* create the zwrite and send the message */
   owl_zwrite_create_from_line(&z, line);
+  owl_zwrite_populate_zsig(&z);
   if (msg) {
     owl_zwrite_set_message(&z, msg);
@@ -416 +417 @@
   /* create the zwrite and send the message */
   owl_zwrite_create_from_line(&z, line);
+  owl_zwrite_populate_zsig(&z);
   if (msg) {
     owl_zwrite_set_message(&z, msg);

zwrite.c

@@ -11 +11 @@
   int argc, badargs, myargc;
   char **argv, **myargv;
-  char *zsigproc, *zsigowlvar, *zsigzvar, *ptr;
-  struct passwd *pw;
 
   badargs=0;
@@ -139 +137 @@
   /* z->message is allowed to stay NULL */
   
+  return(0);
+}
+
+void owl_zwrite_populate_zsig(owl_zwrite *z)
+{
+  char *zsigproc, *zsigowlvar, *zsigzvar, *ptr;
+  struct passwd *pw;
+
   /* get a zsig, if not given */
   if (z->zsig==NULL) {
@@ -184 +190 @@
     }
   }
-
-  return(0);
 }
 
@@ -285 +289 @@
     owl_zwrite_set_message(&z, msg);
   }
+  owl_zwrite_populate_zsig(&z);
   owl_zwrite_send_message(&z);
   owl_zwrite_free(&z);
@@ -358 +363 @@
   return(0);
 }
-  
+
 void owl_zwrite_free(owl_zwrite *z)
 {