Changeset 9190285

Timestamp:

Sep 18, 2010, 5:07:40 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

c394de8

Parents:

08263a8

git-author:

David Benjamin <davidben@mit.edu> (08/14/10 00:54:38)

git-committer:

David Benjamin <davidben@mit.edu> (09/18/10 17:07:40)

Message:

Ref-count the editwin

Files:

• commands.c (modified) (2 diffs)
• editwin.c (modified) (3 diffs)
• tester.c (modified) (3 diffs)

commands.c

@@ -2693 +2693 @@
 
   owl_global_set_typwin_inactive(&g);
-  owl_editwin_delete(e);
+  owl_editwin_unref(e);
 }
 
@@ -2750 +2750 @@
 
   owl_editwin_do_callback(e);
-  owl_editwin_delete(e);
+  owl_editwin_unref(e);
 }
 

editwin.c

@@ -17 +17 @@
 
 struct _owl_editwin { /*noproto*/
+  int refcount;
   char *buff;
   owl_history *hist;
@@ -74 +75 @@
   e = owl_malloc(sizeof(owl_editwin));
   memset(e, 0, sizeof(*e));
+  e->refcount = 1;
   return e;
 }
 
-void owl_editwin_delete(owl_editwin *e)
+static void _owl_editwin_delete(owl_editwin *e)
 {
   if (e->win) {
@@ -153 +155 @@
   oe_set_window(e, win, winlines, wincols);
   return e;
+}
+
+owl_editwin *owl_editwin_ref(owl_editwin *e)
+{
+  e->refcount++;
+  return e;
+}
+
+void owl_editwin_unref(owl_editwin *e)
+{
+  e->refcount--;
+  if (e->refcount <= 0)
+    _owl_editwin_delete(e);
 }
 

tester.c

@@ -390 +390 @@
                                                             "blah"));
 
-  owl_editwin_delete(oe); oe = NULL;
+  owl_editwin_unref(oe); oe = NULL;
   oe = owl_editwin_new(NULL, 80, 80, OWL_EDITWIN_STYLE_MULTILINE, NULL);
 
@@ -403 +403 @@
                                                             "blah"));
 
-  owl_editwin_delete(oe); oe = NULL;
+  owl_editwin_unref(oe); oe = NULL;
 
   /* Test owl_editwin_move_to_beginning_of_line. */
@@ -425 +425 @@
   FAIL_UNLESS("find beginning of line after empty middle line",
               owl_editwin_move_to_beginning_of_line(oe) == -2);
-  owl_editwin_delete(oe); oe = NULL;
+  owl_editwin_unref(oe); oe = NULL;
 
   printf("# END testing owl_editwin (%d failures)\n", numfailed);