Changeset e6d7e4e for functions.c

Timestamp:

Jun 25, 2011, 3:26:15 AM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

ecffae6

Parents:

eb897c6

git-author:

David Benjamin <davidben@mit.edu> (03/11/11 11:39:41)

git-committer:

David Benjamin <davidben@mit.edu> (06/25/11 03:26:15)

Message:

Replace the puntlist with an GPtrArray

File:

• functions.c (modified) (5 diffs)

functions.c

@@ -2215 +2215 @@
 {
   const owl_filter *f;
-  const owl_list *fl;
+  const GPtrArray *fl;
   char *tmp;
   owl_fmtext fm;
-  int i, j;
+  int i;
 
   owl_fmtext_init_null(&fm);
 
   fl=owl_global_get_puntlist(&g);
-  j=owl_list_get_size(fl);
   owl_fmtext_append_bold(&fm, "Active zpunt filters:\n");
 
-  for (i=0; i<j; i++) {
-    f=owl_list_get_element(fl, i);
+  for (i = 0; i < fl->len; i++) {
+    f = fl->pdata[i];
     owl_fmtext_appendf_normal(&fm, "[% 2d] ", i+1);
     tmp = owl_filter_print(f);
@@ -2787 +2786 @@
 {
   owl_filter *f;
-  owl_list *fl;
-  int i, j;
+  GPtrArray *fl;
+  int i;
   fl=owl_global_get_puntlist(&g);
 
@@ -2799 +2798 @@
 
   /* Check for an identical filter */
-  j=owl_list_get_size(fl);
-  for (i=0; i<j; i++) {
-    if (owl_filter_equiv(f, owl_list_get_element(fl, i))) {
+  for (i = 0; i < fl->len; i++) {
+    if (owl_filter_equiv(f, fl->pdata[i])) {
       owl_function_debugmsg("found an equivalent punt filter");
       /* if we're punting, then just silently bow out on this duplicate */
@@ -2811 +2809 @@
       /* if we're unpunting, then remove this filter from the puntlist */
       if (direction==1) {
-        owl_filter_delete(owl_list_get_element(fl, i));
-        owl_list_remove_element(fl, i);
+        owl_filter_delete(g_ptr_array_remove_index(fl, i));
         owl_filter_delete(f);
         return;
@@ -2822 +2819 @@
     owl_function_debugmsg("punting");
     /* If we're punting, add the filter to the global punt list */
-    owl_list_append_element(fl, f);
+    g_ptr_array_add(fl, f);
   } else if (direction == 1) {
     owl_function_makemsg("No matching punt filter");