Changes in zwrite.c [3cdd6d2:d427f08]

File:

• zwrite.c (modified) (15 diffs)

zwrite.c

@@ -5 +5 @@
 #include "owl.h"
 
-CALLER_OWN owl_zwrite *owl_zwrite_new(const char *line)
+G_GNUC_WARN_UNUSED_RESULT owl_zwrite *owl_zwrite_new(const char *line)
 {
   owl_zwrite *z = g_new(owl_zwrite, 1);
@@ -34 +34 @@
   z->cc=0;
   z->noping=0;
-  z->recips = g_ptr_array_new();
+  owl_list_create(&(z->recips));
   z->zwriteline = g_strdup(line);
 
@@ -97 +97 @@
       }
       /* we must already have users or a class or an instance */
-      if (z->recips->len < 1 && (!z->class) && (!z->inst)) {
+      if (owl_list_get_size(&(z->recips))<1 && (!z->class) && (!z->inst)) {
         badargs=1;
         break;
@@ -117 +117 @@
     } else {
       /* anything unattached is a recipient */
-      g_ptr_array_add(z->recips, owl_validate_utf8(myargv[0]));
+      owl_list_append_element(&(z->recips), owl_validate_utf8(myargv[0]));
       myargv++;
       myargc--;
@@ -131 +131 @@
   if (z->class == NULL &&
       z->inst == NULL &&
-      z->recips->len == 0) {
+      owl_list_get_size(&(z->recips))==0) {
     owl_function_error("You must specify a recipient for zwrite");
     return(-1);
@@ -162 +162 @@
 void owl_zwrite_send_ping(const owl_zwrite *z)
 {
-  int i;
+  int i, j;
   char *to;
 
@@ -173 +173 @@
   /* if there are no recipients we won't send a ping, which
      is what we want */
-  for (i = 0; i < z->recips->len; i++) {
+  j=owl_list_get_size(&(z->recips));
+  for (i=0; i<j; i++) {
     to = owl_zwrite_get_recip_n_with_realm(z, i);
     send_ping(to, z->class, z->inst);
@@ -190 +191 @@
 void owl_zwrite_set_message(owl_zwrite *z, const char *msg)
 {
-  int i;
+  int i, j;
   GString *message;
   char *tmp = NULL, *tmp2;
@@ -196 +197 @@
   g_free(z->message);
 
-  if (z->recips->len > 0 && z->cc) {
+  j=owl_list_get_size(&(z->recips));
+  if (j>0 && z->cc) {
     message = g_string_new("CC: ");
-    for (i = 0; i < z->recips->len; i++) {
+    for (i=0; i<j; i++) {
       tmp = owl_zwrite_get_recip_n_with_realm(z, i);
       g_string_append_printf(message, "%s ", tmp);
@@ -231 +233 @@
 int owl_zwrite_send_message(const owl_zwrite *z)
 {
-  int i, ret = 0;
+  int i, j, ret = 0;
   char *to = NULL;
 
   if (z->message==NULL) return(-1);
 
-  if (z->recips->len > 0) {
-    for (i = 0; i < z->recips->len; i++) {
+  j=owl_list_get_size(&(z->recips));
+  if (j>0) {
+    for (i=0; i<j; 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);
@@ -309 +312 @@
 int owl_zwrite_get_numrecips(const owl_zwrite *z)
 {
-  return z->recips->len;
+  return(owl_list_get_size(&(z->recips)));
 }
 
 const char *owl_zwrite_get_recip_n(const owl_zwrite *z, int n)
 {
-  return z->recips->pdata[n];
+  return(owl_list_get_element(&(z->recips), n));
 }
 
 /* Caller must free the result. */
-CALLER_OWN char *owl_zwrite_get_recip_n_with_realm(const owl_zwrite *z, int n)
+G_GNUC_WARN_UNUSED_RESULT char *owl_zwrite_get_recip_n_with_realm(const owl_zwrite *z, int n)
 {
   if (z->realm[0]) {
@@ -330 +333 @@
 {
   /* return true if at least one of the recipients is personal */
-  int i;
-  char *recip;
-
-  for (i = 0; i < z->recips->len; i++) {
-    recip = z->recips->pdata[i];
-    if (recip[0] != '@') return 1;
+  int i, j;
+  char *foo;
+
+  j=owl_list_get_size(&(z->recips));
+  for (i=0; i<j; i++) {
+    foo=owl_list_get_element(&(z->recips), i);
+    if (foo[0]!='@') return(1);
   }
   return(0);
@@ -348 +352 @@
 void owl_zwrite_cleanup(owl_zwrite *z)
 {
-  owl_ptr_array_free(z->recips, g_free);
+  owl_list_cleanup(&(z->recips), &g_free);
   g_free(z->cmd);
   g_free(z->zwriteline);
@@ -366 +370 @@
  * If not a CC, only the recip_index'th user will be replied to.
  */
-CALLER_OWN char *owl_zwrite_get_replyline(const owl_zwrite *z, int recip_index)
+G_GNUC_WARN_UNUSED_RESULT char *owl_zwrite_get_replyline(const owl_zwrite *z, int recip_index)
 {
   /* Match ordering in zwrite help. */
@@ -399 +403 @@
   }
   if (z->cc) {
-    for (i = 0; i < z->recips->len; i++) {
+    for (i = 0; i < owl_list_get_size(&(z->recips)); i++) {
       g_string_append_c(buf, ' ');
-      owl_string_append_quoted_arg(buf, z->recips->pdata[i]);
+      owl_string_append_quoted_arg(buf, owl_list_get_element(&(z->recips), i));
     }
-  } else if (recip_index < z->recips->len) {
+  } else if (recip_index < owl_list_get_size(&(z->recips))) {
     g_string_append_c(buf, ' ');
-    owl_string_append_quoted_arg(buf, z->recips->pdata[recip_index]);
+    owl_string_append_quoted_arg(buf, owl_list_get_element(&(z->recips), recip_index));
   }