Changeset 3f52e14 for zwrite.c

Timestamp:

Mar 24, 2011, 4:44:06 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

5d56a27

Parents:

a5b5d00

git-author:

David Benjamin <davidben@mit.edu> (03/11/11 17:21:12)

git-committer:

David Benjamin <davidben@mit.edu> (03/24/11 16:44:06)

Message:

Add owl_zwrite_get_recip_n_with_realm

Refactor owl_zwrite code abit to handle -r in a consistent place.

File:

• zwrite.c (modified) (7 diffs)

zwrite.c

@@ -175 +175 @@
   j=owl_list_get_size(&(z->recips));
   for (i=0; i<j; i++) {
-    if (strcmp(z->realm, "")) {
-      to = g_strdup_printf("%s@%s", (const char *) owl_list_get_element(&(z->recips), i), z->realm);
-    } else {
-      to = g_strdup(owl_list_get_element(&(z->recips), i));
-    }
+    to = owl_zwrite_get_recip_n_with_realm(z, i);
     send_ping(to, z->class, z->inst);
     g_free(to);
@@ -196 +192 @@
 {
   int i, j;
-  char *toline = NULL;
+  GString *message;
   char *tmp = NULL, *tmp2;
 
@@ -203 +199 @@
   j=owl_list_get_size(&(z->recips));
   if (j>0 && z->cc) {
-    toline = g_strdup( "CC: ");
+    message = g_string_new("CC: ");
     for (i=0; i<j; i++) {
-      tmp = toline;
-      if (strcmp(z->realm, "")) {
-        toline = g_strdup_printf( "%s%s@%s ", toline, (const char *) owl_list_get_element(&(z->recips), i), z->realm);
-      } else {
-        toline = g_strdup_printf( "%s%s ", toline, (const char *) owl_list_get_element(&(z->recips), i));
-      }
+      tmp = owl_zwrite_get_recip_n_with_realm(z, i);
+      g_string_append_printf(message, "%s ", tmp);
       g_free(tmp);
       tmp = NULL;
@@ -216 +208 @@
     tmp = owl_validate_utf8(msg);
     tmp2 = owl_text_expand_tabs(tmp);
-    z->message=g_strdup_printf("%s\n%s", toline, tmp2);
-    g_free(toline);
+    g_string_append_printf(message, "\n%s", tmp2);
+    z->message = g_string_free(message, false);
     g_free(tmp);
     g_free(tmp2);
@@ -249 +241 @@
   if (j>0) {
     for (i=0; i<j; i++) {
-      if (strcmp(z->realm, "")) {
-        to = g_strdup_printf("%s@%s", (const char *) owl_list_get_element(&(z->recips), i), z->realm);
-      } else {
-        to = g_strdup( owl_list_get_element(&(z->recips), i));
-      }
+      to = owl_zwrite_get_recip_n_with_realm(z, i);
       ret = send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, z->message);
       /* Abort on the first error, to match the zwrite binary. */
@@ -322 +310 @@
 }
 
-void owl_zwrite_get_recipstr(const owl_zwrite *z, char *buff)
-{
-  int i, j;
-
-  strcpy(buff, "");
-  j=owl_list_get_size(&(z->recips));
-  for (i=0; i<j; i++) {
-    strcat(buff, owl_list_get_element(&(z->recips), i));
-    strcat(buff, " ");
-  }
-  buff[strlen(buff)-1]='\0';
-}
-
 int owl_zwrite_get_numrecips(const owl_zwrite *z)
 {
@@ -343 +318 @@
 {
   return(owl_list_get_element(&(z->recips), n));
+}
+
+/* Caller must free the result. */
+char *owl_zwrite_get_recip_n_with_realm(const owl_zwrite *z, int n)
+{
+  if (z->realm[0]) {
+    return g_strdup_printf("%s@%s", owl_zwrite_get_recip_n(z, n), z->realm);
+  } else {
+    return g_strdup(owl_zwrite_get_recip_n(z, n));
+  }
 }