Changeset 01ff87d for zwrite.c

Timestamp:

Aug 15, 2009, 7:16:47 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

4db2355

Parents:

96cdeaf (diff), 369a7f0 (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 branch 'andersk/const'

File:

• zwrite.c (modified) (16 diffs)

zwrite.c

@@ -5 +5 @@
 #include "owl.h"
 
-int owl_zwrite_create_from_line(owl_zwrite *z, char *line)
+int owl_zwrite_create_from_line(owl_zwrite *z, const char *line)
 {
   int argc, badargs, myargc, i, len;
-  char **argv, **myargv;
+  char **argv;
+  const char *const *myargv;
   char *msg = NULL;
 
@@ -25 +26 @@
 
   /* parse the command line for options */
-  argv=myargv=owl_parseline(line, &argc);
+  argv=owl_parseline(line, &argc);
+  myargv=strs(argv);
   if (argc<0) {
     owl_function_error("Unbalanced quotes in zwrite");
@@ -150 +152 @@
 void owl_zwrite_populate_zsig(owl_zwrite *z)
 {
-  char *zsigproc, *zsigowlvar, *zsigzvar, *ptr;
+  const char *zsigproc, *zsigowlvar, *zsigzvar;
+  char *ptr;
   struct passwd *pw;
 
@@ -200 +203 @@
 }
 
-void owl_zwrite_send_ping(owl_zwrite *z)
+void owl_zwrite_send_ping(const owl_zwrite *z)
 {
   int i, j;
@@ -216 +219 @@
   for (i=0; i<j; i++) {
     if (strcmp(z->realm, "")) {
-      to = owl_sprintf("%s@%s", (char *) owl_list_get_element(&(z->recips), i), z->realm);
+      to = owl_sprintf("%s@%s", (const char *) owl_list_get_element(&(z->recips), i), z->realm);
     } else {
       to = owl_strdup(owl_list_get_element(&(z->recips), i));
@@ -226 +229 @@
 }
 
-void owl_zwrite_set_message(owl_zwrite *z, char *msg)
+void owl_zwrite_set_message(owl_zwrite *z, const char *msg)
 {
   int i, j;
@@ -240 +243 @@
       tmp = toline;
       if (strcmp(z->realm, "")) {
-        toline = owl_sprintf( "%s%s@%s ", toline, (char *) owl_list_get_element(&(z->recips), i), z->realm);
+        toline = owl_sprintf( "%s%s@%s ", toline, (const char *) owl_list_get_element(&(z->recips), i), z->realm);
       } else {
-        toline = owl_sprintf( "%s%s ", toline, (char *) owl_list_get_element(&(z->recips), i));
+        toline = owl_sprintf( "%s%s ", toline, (const char *) owl_list_get_element(&(z->recips), i));
       }
       owl_free(tmp);
@@ -260 +263 @@
 }
 
-char *owl_zwrite_get_message(owl_zwrite *z)
+const char *owl_zwrite_get_message(const owl_zwrite *z)
 {
   if (z->message) return(z->message);
@@ -266 +269 @@
 }
 
-int owl_zwrite_is_message_set(owl_zwrite *z)
+int owl_zwrite_is_message_set(const owl_zwrite *z)
 {
   if (z->message) return(1);
@@ -272 +275 @@
 }
 
-int owl_zwrite_send_message(owl_zwrite *z)
+int owl_zwrite_send_message(const owl_zwrite *z)
 {
   int i, j;
@@ -283 +286 @@
     for (i=0; i<j; i++) {
       if (strcmp(z->realm, "")) {
-        to = owl_sprintf("%s@%s", (char *) owl_list_get_element(&(z->recips), i), z->realm);
+        to = owl_sprintf("%s@%s", (const char *) owl_list_get_element(&(z->recips), i), z->realm);
       } else {
         to = owl_strdup( owl_list_get_element(&(z->recips), i));
@@ -299 +302 @@
 }
 
-int owl_zwrite_create_and_send_from_line(char *cmd, char *msg)
+int owl_zwrite_create_and_send_from_line(const char *cmd, const char *msg)
 {
   owl_zwrite z;
@@ -314 +317 @@
 }
 
-char *owl_zwrite_get_class(owl_zwrite *z)
+const char *owl_zwrite_get_class(const owl_zwrite *z)
 {
   return(z->class);
 }
 
-char *owl_zwrite_get_instance(owl_zwrite *z)
+const char *owl_zwrite_get_instance(const owl_zwrite *z)
 {
   return(z->inst);
 }
 
-char *owl_zwrite_get_opcode(owl_zwrite *z)
+const char *owl_zwrite_get_opcode(const owl_zwrite *z)
 {
   return(z->opcode);
 }
 
-void owl_zwrite_set_opcode(owl_zwrite *z, char *opcode)
+void owl_zwrite_set_opcode(owl_zwrite *z, const char *opcode)
 {
   if (z->opcode) owl_free(z->opcode);
@@ -335 +338 @@
 }
 
-char *owl_zwrite_get_realm(owl_zwrite *z)
+const char *owl_zwrite_get_realm(const owl_zwrite *z)
 {
   return(z->realm);
 }
 
-char *owl_zwrite_get_zsig(owl_zwrite *z)
+const char *owl_zwrite_get_zsig(const owl_zwrite *z)
 {
   if (z->zsig) return(z->zsig);
@@ -346 +349 @@
 }
 
-void owl_zwrite_get_recipstr(owl_zwrite *z, char *buff)
+void owl_zwrite_get_recipstr(const owl_zwrite *z, char *buff)
 {
   int i, j;
@@ -359 +362 @@
 }
 
-int owl_zwrite_get_numrecips(owl_zwrite *z)
+int owl_zwrite_get_numrecips(const owl_zwrite *z)
 {
   return(owl_list_get_size(&(z->recips)));
 }
 
-char *owl_zwrite_get_recip_n(owl_zwrite *z, int n)
+const char *owl_zwrite_get_recip_n(const owl_zwrite *z, int n)
 {
   return(owl_list_get_element(&(z->recips), n));
 }
 
-int owl_zwrite_is_personal(owl_zwrite *z)
+int owl_zwrite_is_personal(const owl_zwrite *z)
 {
   /* return true if at least one of the recipients is personal */