Changeset 147d880

Timestamp:

Aug 25, 2008, 8:11:12 PM (16 years ago)

Author:

Nelson Elhage <nelhage@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:

740d5f7

Parents:

da466e0

Message:

Move 'zwriteline' to a message attribute, not a field in struct owl_message.

Files:

• message.c (modified) (6 diffs)
• owl.h (modified) (1 diff)

message.c

@@ -42 +42 @@
   owl_message_set_direction_none(m);
   m->delete=0;
-  m->zwriteline=NULL;
 
   owl_message_set_hostname(m, "");
@@ -485 +484 @@
 char *owl_message_get_zwriteline(owl_message *m)
 {
-  if(!m->zwriteline)
-    return "";
-  return(m->zwriteline);
+  char *z = owl_message_get_attribute_value(m, "zwriteline");
+  if (!z) return "";
+  return z;
 }
 
 void owl_message_set_zwriteline(owl_message *m, char *line)
 {
-  if(m->zwriteline) owl_free(m->zwriteline);
-  m->zwriteline=owl_strdup(line);
+  owl_message_set_attribute(m, "zwriteline", line);
 }
 
@@ -860 +858 @@
   }
 
-  m->zwriteline=owl_strdup("");
-
   /* save the hostname */
   owl_function_debugmsg("About to do gethostbyaddr");
@@ -942 +938 @@
   }
 
-  m->zwriteline=owl_strdup("");
-
   owl_message_set_body(m, "<uninitialized>");
 
@@ -975 +969 @@
   owl_message_set_opcode(m, owl_zwrite_get_opcode(&z));
   owl_message_set_realm(m, owl_zwrite_get_realm(&z)); /* also a hack, but not here */
-  m->zwriteline=owl_strdup(line);
+  owl_message_set_zwriteline(m, line);
   owl_message_set_body(m, body);
   owl_message_set_zsig(m, zsig);
@@ -1016 +1010 @@
 #endif
   if (m->timestr) owl_free(m->timestr);
-  if (m->zwriteline) owl_free(m->zwriteline);
 
   /* free all the attributes */

owl.h

@@ -342 +342 @@
   char *timestr;
   time_t time;
-  char *zwriteline;
 } owl_message;