Changeset ef6e2d1

Timestamp:

Feb 28, 2007, 9:07:15 PM (17 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

124aebc

Parents:

cc5b906

git-author:

Nelson Elhage <nelhage@mit.edu> (02/27/07 23:37:40)

git-committer:

Nelson Elhage <nelhage@mit.edu> (02/28/07 21:07:15)

Message:

Refactoring list, to include a generic insert method

File:

• list.c (modified) (2 diffs)

list.c

@@ -22 +22 @@
 }
 
+
+void owl_list_grow(owl_list *l, int n) /*noproto*/
+{
+  void *ptr;
+
+  if ((l->size+n) > (l->avail/GROWAT)) {
+    ptr=owl_realloc(l->list, l->avail*GROWBY*sizeof(void *));
+    if (ptr==NULL) abort();
+    l->list=ptr;
+    l->avail=l->avail*GROWBY;
+  }
+
+}
+
 void *owl_list_get_element(owl_list *l, int n)
 {
@@ -28 +42 @@
 }
 
-int owl_list_append_element(owl_list *l, void *element)
+int owl_list_insert_element(owl_list *l, int at, void *element)
 {
-  void *ptr;
-  
-  if ((l->size+1) > (l->avail/GROWAT)) {
-    ptr=owl_realloc(l->list, l->avail*GROWBY*sizeof(void *));
-    if (ptr==NULL) return(-1);
-    l->list=ptr;
-    l->avail=l->avail*GROWBY;
+  int i;
+  if(at < 0 || at > l->size) return -1;
+  owl_list_grow(l, 1);
+
+  for (i=l->size; i>at; i--) {
+    l->list[i]=l->list[i-1];
   }
 
-  l->list[l->size]=element;
+  l->list[at] = element;
   l->size++;
   return(0);
 }
 
+int owl_list_append_element(owl_list *l, void *element)
+{
+  return owl_list_insert_element(l, l->size, element);
+}
+
 int owl_list_prepend_element(owl_list *l, void *element)
 {
-  void *ptr;
-  int i;
- 
-  if ((l->size+1) > (l->avail/GROWAT)) {
-    ptr=owl_realloc(l->list, l->avail*GROWBY*sizeof(void *));
-    if (ptr==NULL) return(-1);
-    l->list=ptr;
-    l->avail=l->avail*GROWBY;
-  }
-
-  for (i=l->size; i>0; i--) {
-    l->list[i]=l->list[i-1];
-  }
-  l->list[0]=element;
-  l->size++;
-  return(0);
+  return owl_list_insert_element(l, 0, element);
 }